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