Bumping Version
Merge branch 'release/2.4' into develop