Merge branch '3.7.1-dev' into 'master'

3.7.1 dev

See merge request !20
2 jobs for master
in 6 seconds, using 0 compute credits, and was queued for 1 second
latest