cherry-pick-9ebe6ae.patch
