A......... [ZBX-8195] merge from trunk