commit #1 in branch with fixes
Commit #2 in branch
Merge branch 'US1234_add_cool_feature'