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