Merge "Structural changes to support atomic installs"