Merge "change onData() to take byte array of raw data"