Merge branch '3.7.1-dev' into 'master'

3.7.1 dev

See merge request !20
1 job for 3.7.1-maintenance
in 0 seconds, using 0 compute credits, and was queued for 8 seconds