Merge branch 'master' into 'production'

Master

See merge request !87
3 jobs for 53-assign-specific-hourly-profiles-for-friday-day-type
in 0 seconds, using 0 compute credits, and was queued for 0 seconds