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