Draft: refactor

Pavel Kuzmenko requested to merge epic/refactoring into master

Merge request reports