This is a re-opening of !11386 that is stuck in a "never ending merging loop".
See !11386 for details.