Bump version numbers
Merge branch 'release-2.4.0' into production
Merge branch 'production'