Release 2.4.0
Merge branch 'release/v2_4_0' into dev