Merge pull request #339 from CruGlobal/MH-975

Mh 975
Merge branch 'master' into dev