Hotfix/v3.36.2

Pavel Kuzmenko requested to merge hotfix/v3.36.2 into master

Merge request reports