Merge branch 'fix-notification-warnings' into 'develop'