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