cb8951eeef
This is another cherry-pick of the commit475a80b641which was accidentally reverted by927706883eduring the rebase on master