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