Diagnostics for NSME (EA-39972)
(cherry picked from commit 03826d1)