I've merged the preparation PR for 2.0.0a1 - feel free to merge other changes as usual if you were holding off.