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