Merge pull request #12550 from TELUS-BBA/feat/zabbix