diagnostics for EA-49831
(cherry picked from commit 64594cd)