Merge branch 'feature/1635-notifications-include-types' into 'develop'