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