Create a 2.5-dev version. Prepare to cherry-pick 2.4 commits.