.......... [ZBX-7839] merge from trunk