Merge pull request #8540 from BKPepe/zabbix