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