Merge branch 'release/4.2' into develop