I don't think that there's more to do. I'm happy to create another PR (to preserve the commits in the existing conversation) with a separate bundle to test.

Is there any chance that this fix will make it into the 5.0.x and/or 5.1.x streams?