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