Prepare release 2.4.0.2
Merge branch 'release/V2.4.0.2' into develop