Squash.

[Review issue 7422001]
Update merge from local master.