Merge branch 'release/4.2.0'

3 jobs for master in 6 minutes and 29 seconds (queued for 1 second)