I'll look into if I can make motion happen on Teds diff.... WE could maybe even just ship it? And make the assumption that when #6170 ships we'll have relateively decent testing around it?