cherry-pick-14e51893e5b5.patch
