Backport by git cherry-pick -x e8aff94cefeb75d08d7d763ea1a4c0d08ffa3ca8 and modified.
git cherry-pick -x e8aff94cefeb75d08d7d763ea1a4c0d08ffa3ca8