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