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