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