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