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