Merge "Add cheeps option to acloud"