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