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