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