Merge pull request #77 from MartinBieth/master

Resole User Stories 471 to 474
Merge remote-tracking branch 'upstream/master'
HUB-430 : remove # of msgid