This patch appears to break data over QOS. You should pull that back in. Otherwise, awesome looking patch. I'll give it a try.