8 Commits (0.8-backports)