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