.......... [ZBXNEXT-1133] merge from trunk