Updating to version 2.4.1.
Merge branch 'release/v2.4.1' into develop