merge-ignore changes that were already in or that are not relevant

Merge commit '7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD