Commits
Andrejs Kozlovs authored and Sergey Simonenko committed 89a4943dbae
...G...... [ZBXNEXT-7408] resolved cherry-pick merge conflicts Merge in ZBX/zabbix from feature/ZBXNEXT-7408-5.0 to release/5.0 * commit 'db3bb390d575caec5e9c90e5c5fcef27deb9bb3f': ...G...... [ZBXNEXT-7408] fixed merge errors (cherry picked from commit fbc17ebf34769021dae7e1438ab77d0cca40ebba)