Merge branch 'develop' into bugfix/web-notification-special-char