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