cherry-pick-07a2ce61e31a.patch
