Merge pull request #90478 from xedin/reduce-diagnostics-use-of-cs