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