My company has been waiting for 9.6 to come out and it is supposed to have a fix for Trap messages not containing RAW data. Some of the team is holding pitch forks and torches near the Orion server and screaming for an Open Source solution. I am holding them off but only by throwing them scraps of meat.
I need to get some sort of timeframe on when 9.6 will be out or you may be losing a customer... RIP!