Hotfix/v1.6.4

dmitry.mashoshin requested to merge hotfix/v1.6.4 into master

Merge request reports