Hey
Thanks for raising this issue as well. I’ve logged a bug for this one, as it’s not expected behaviour.
https://issues.unrealengine.com/issue/UE-265776
The patch file you sent seems like a reasonable approach as we don’t have this setup at for this type of thing at the moment. Note though, that the final solution we use to solve may be very different and you’ll want to be on the lookout for that.