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