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