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