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