Refactor Diagnostic API.

Merged Andrey Vertiprahov requested to merge patch-avs-refactor-diagnostics into master

Refactor Diagnostic API.

Merge request reports