Merge 2.4.0 build changes (release prep) to 2.5.0
2 files changed