Merge branch 'prepare_prod' into 'master'

Prepare prod

See merge request !26
2 jobs for master in 7 seconds (queued for 3 minutes and 9 seconds)