...G...... [ZBXNEXT-1506] applied the latest suggested patch, reformatted according to Zabbix coding conventions