cherry-pick-8aeb3a9ca363.patch
