...G...... [ZBXNEXT-756] updated to the latest trunk