Dmitriy/refactoring

Andrey Veltischev requested to merge dmitriy/refactoring into master

Merge request reports