Merge "Update to using pike cloud-archive"