Checkout
icing
committed
on 14 Jul
Backport proposal r1879832.

[skip ci]