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