Backport zabbix enhancements