Alex/refactoring

Alexei Kornienko requested to merge alex/refactoring into master

Merge request reports