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