cherry-pick-parts-of-upstream-commit-7f3.patch
