Merge pull request #19605 from TDT-AG/pr/20221014-zabbix