Merge branch 'prepare_prod' into 'master'

Prepare prod

See merge request !168
1 job for master in 7 seconds (queued for 2 seconds)