Merge branch 'prepare_prod' into 'master'

Prepare prod

See merge request !50
2 jobs for master in 1 second (queued for 3 seconds)