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