Merge branch '3.6.1-dev'

1 job for 3.6.1-maintenance
in 0 seconds, using 0 compute credits, and was queued for 18 seconds