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