[UPDATE] Bump to 2.4.0
Merge branch 'release/2.4.0' into develop