Merge pull request #13029 from bob-wilson/rdar35100697