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