cherry-pick-d0ee0197ddff.patch
