Merge branch '3.7.1-dev' into 'master'

3.7.1 dev

See merge request !6
3 jobs for v3.7.1
in 18 seconds, using 0 compute credits, and was queued for 2 seconds
latest