Bump version to 2.4.0
Merge branch 'release/2.4.0'
Merge tag '2.4.0' into develop

2.4.0