Let's get 0.4 out to ease cleanup the bunch of PRs out there