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