Merge branch 'v4.2.0'