Merging fixes from Zabbix forums