Merging [19298] from 1.0 branch.