Merge branch 'master' into 'develop-79-entry-points-2'

Master

See merge request !123
3 jobs for develop-79-entry-points-2
in 37 seconds, using 0 compute credits, and was queued for 1 second