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