.......... [ZBX-8194] updated to latest from trunk