Added additional diagnostics to help with #12151.
1 file changed