Alright, it's looking like Ted has most of the issues addressed for #6144, I'll wait for @Stefano Bonicatti to give it a stamp of approval, but once that ships I think we just need #6197 and we should be good for a tag.