Merge branch 'release/4.2.0' into develop