cherry-pick-afea99f8eacc.patch
