Cherry-picking 6758350 for delivery.

ready for @Colleoni to test. Again, yah.