Merged:

https://github.com/tianocore/edk2/pull/2591