Merge release/v2.4.0
to develop
#5371
+6
−0
Merged
release/v2.4.0
to develop
#5371