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