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