I'm cool with creating a 5.0 branch and having this merged in. We can bump the official version to 5 when all the clients are done.