7 Commits (issue#3396)