Updating to version 2.4.2.
Merge branch 'release/v2.4.2' into develop