...G...... [ZBXNEXT-2320] ported ZBX-8236.3 fix