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