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