Merge branch 'mark-notifications-as-read' into 'develop'