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