Merge branch 'revert-970ac539' into 'production'

Revert "Merge branch 'master' into 'production'"

See merge request !20
3 jobs for production
in 1 minute and 35 seconds, using 0 compute credits, and was queued for 2 minutes and 44 seconds