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