Merge branch 'develop'

1 job for v3.8.2 in 1 minute and 18 seconds (queued for 1 second)