Kpn/19/bug fix

Pavel Kuzmenko requested to merge kpn/19/bug_fix into master

Merge request reports