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