cherry-pick-f1d22ed2e443.patch
