Version 2.4.0
Merge branch 'release/v2.4.0' into develop