Merge branch 'feature/rebase-subcommand' into develop