Merge pull request #22534 from Ansuel/update-zabbix