Subdivision surfaces rebased squashed (TESTING ONLY, DO NOT MERGE)

If this works, I will force push it to the original PR and merge that.  This PR is only for CI testing pruposes.