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