cherry-pick 1574e1bb