release-19.2:Backport!2373

Merged MaksimSmile13 requested to merge sysfaray-release-19.2-patch-02795 into release-19.2

Merge request reports