14 Commits (bugfix/dropped-commands)