cherry-pick-0873ec164a.patch
