Squash.

[Review issue ]
Commit

[Review issue ]