Adding the commit rebase
Merge branch 'feature-branch-rebase'