Merge "Fix Invalid Surface error" into main