Merge "Use slaves created from cloud"