Merge "Treat APEX installs as upgrades" into sc-dev