Merge branch '3.6.1-dev'

1 job for 4.3.1-dev
in 0 seconds, using 0 compute credits, and was queued for 2 minutes and 4 seconds