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