.......... [ZBXNEXT-282] updated to the latest /trunk