19 Commits (bugfix/10.0)