.......... [ZBXNEXT-101] updated to the latest trunk