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