Hi, can we merge this? https://edk2.groups.io/g/devel/message/97026 I've created a pull request if it's easier to merge for you: https://github.com/tianocore/edk2/pull/3718 -- Best regards, Corvin