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