Merge branch 'prepare_prod' into 'master'

Prepare prod

See merge request !91
3 jobs for master in 15 seconds (queued for 1 second)