Merge branch 'ew-dev' into development
Merge branch 'development'
MSGStore tests have been improved.
Merge branch 'ew-dev' into development
Merge branch 'development'
Merge branch 'master' into kk-dev