I tested this and it works great. The patch looks correct as well and except ...

I tested this and it works great. The patch looks correct as well and except for tests that seem to be repeated in various other patches in the queue, everything looks good.

Before:

After:

As for the repeated tests, we would have to reroll other patches once this gets in. It also makes logical sense to commit this one first as this one is about instances.