Merge branch 'fix-production_2.0.0b' into 'production'

Merge master to production for 2.0.0

See merge request !171
1 job for v2.0.0
in 9 minutes and 13 seconds, using 0 compute credits, and was queued for 8 minutes and 11 seconds
latest