Merge branch 'dev-v3.6.1' into master

1 job for dev-v3.7.1 in 0 seconds (queued for 27 seconds)