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