Updated so that install/upgrade share similar
4.0.0-rc1