Merge branch 'additional_fields' into notifications

3 jobs for notifications in 2 minutes and 45 seconds (queued for 1 second)