Backport of r120880