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