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