Hi Robert,

Thank you for the confirmation.
The patch is upstreamed through the below commit: https://github.com/tianocore/edk2-test/commit/1d181ad0d82520c099435ff08a8e829b44f493cc

With Warm Regards,
Edhay