.......... [ZBXNEXT-2107] updated to latest from trunk