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