Hotfix/v1.8.4

Denis Brekhunov requested to merge hotfix/v1.8.4 into master

Merge request reports