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