Reverted misstake changes
Merge branch 'release-2.4.0'