Merge pull request #23599 from guidosarducci/master-fix-zabbix-musl