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