Merge pull request #90365 from xedin/fix-some-failed-to-produce-a-diagnostic-issues