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