.......... [ZBXNEXT-497] updated to trunk