.......... [ZBXNEXT-1133] merge from 2.2