Bumped versions
Merge branch 'release/2.4.0' into develop