I seriously doubt any of this would be merged into mainline and I don't really want to maintain patches