Update to support 5.0 dev and new v7 dev.