Updated version to 2.4
Merge branch 'release/2.4' into develop