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