Merge branch 'revert-f287ea2c' into 'master'

Revert "Merge branch 'prepare_prod' into 'master'"

See merge request !104
1 job for master in 5 seconds (queued for 2 seconds)