Merge branch 'release/2.4.2' into production
Merge tag 'v2.4.2'

2.4.2