6 Commits (cherry-pick-7652376a)