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