Merge branch 'notifications' into additional_fields

3 jobs for additional_fields in 8 minutes and 44 seconds