cherry-pick-971d6055e7b7.patch