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