Merge "Update volume client class description"