Merge branch 'master' into 'production'

Master

See merge request !51
3 jobs for develop-27-2-0-0-updates
in 2 minutes and 7 seconds, using 0 compute credits, and was queued for 1 minute and 4 seconds