Merge "Support 2.4.0 release branch"