Merge "Update base files script works anywhere."