Merge "Add method to get surface dataspace"