Merge branch 'release/4.2.1'

3 jobs for master in 5 minutes and 46 seconds