cherry-pick-3fbd1dca6a4d.patch
