Hotfix/v3.6.0

dmitry.mashoshin requested to merge hotfix/v3.6.0 into master

Merge request reports