Merge pull request #13294 from terfendail:contours_wintr