Diagnostic additions
Revert "Diagnostic additions"

This reverts commit 05e63af62c382c969f9c60656a9c918a633f264e.
Revert "Revert "Diagnostic additions""

This reverts commit 36ae164b50b57de56bfb989ec231c5e04c7848c7.