Version bump to 2.4.0
Archive Version 2.4.0
Merge branch 'release/2.4.0' into develop