Merge "Add ObjectStorageClient for cleanup"