Merge branch 'additional_fields' into notifications

3 jobs for notifications in 5 minutes and 47 seconds (queued for 3 seconds)