Merge branch 'master' into 'production'

Merging master branch into production branch

See merge request !76
1 job for v3.1.0
in 12 minutes and 36 seconds, using 0 compute credits, and was queued for 12 minutes and 4 seconds
latest