Merge remote-tracking branch 'origin/develop' into bugfix/ZP-779-message-is-suddenly-unread-after-moving