cherry-pick-8114a24a.patch
