Merge pull request #22549 from TDT-AG/pr/20231030-zabbix