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