cherry-pick-f1d22ed2e4.patch
