.......... [ZBXNEXT-2222] updated to the latest /trunk