hotfix/v1.25.2

Pavel Kuzmenko requested to merge hotfix/v1.25.2 into master

hotfix/v1.25.2

Merge request reports