One commit back of story 8
Two commit back of story 8
Merge branch 'story-7-test4-merging-in-advance'