Merge branch 'release/2.4.0' into develop
Update test suite.
Merge branch 'release/2.4.0'