cherry-pick-ed2a5b572f0f.patch
