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