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