Hi Will,

Sorry I didn't respond yesterday but I wasn't certain whether the fix I added would be optimal. It turns out that it was perhaps too aggressive and is causing some failures in other parts of the product. My plan is to revert that change and use a more targeted approach to fix that scenario.

I'll update this ticket when the fix gets committed.

thanks, Karl