Well, I don't think there's a huge amount we can do atm, aside from work on reviewing/testing #6197. Let's also give some ToB folks a chance to parse through this wall of text and get their input