Added rebase command.
Merge branch 'feature-rebase' into develop