Milestone for tracking work that's being deferred until after 4.x stable.

Once the 4 branch is created, master will come the 5.x branch, and these changes can being to get merged. Until then, PRs should remain unmerged.