cherry-pick-4b2fad1.patch
