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