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