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