7 Commits (pull-922-suggestions)