4.2.0
Merge branch 'release/4.2.0'