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