Merge "Change new file installs to be cluster-based!"