cherry-pick-ffae953f7ec8.patch
