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