[TD-9818] Some diagnostics
Merge pull request #2 from BIAINC/TD-9818

[TD-9818] Some diagnostics