6 Commits (fix-pr-7909)