Merge branch 'release/4.0.0'

3 jobs for master in 2 minutes and 39 seconds (queued for 2 seconds)