Hotfix to master

Dmytro Halinovskyi requested to merge dmitriy/hotfix into master

Merge request reports