cherry-pick-95a32cb37edb.patch
