Fixes
Merge origin/develop into develop
Fixes
Calendar fixes
Msg read fix
Msg read fix
Merge origin/develop into develop