Commits
Konstantins Prutkovs authored 971369ee49a
........S. [ZBX-21898] applied changes from ZBX-22149 to release/6.4 (cherry picked from commit 68891c80d57c2ab361ec0f8c0b6ed292cefb2269) (cherry picked from commit a98ef27756177ce773914bde23270f76c004d4ae)