US#18 - feature-1
US#19 - feature-1 commit (b)
Merge branch 'feature-1'