Merge "Correctly compute a physical surface." into main