Alex/refactoring

Andrey Veltischev requested to merge alex/refactoring into master

Merge request reports