Merge "Use create_volume classmethod"