The solution is upstreamed by commit-id:&nbsp;<a href="https://github.com/tianocore/edk2-test/commit/814b2af535d977b3967d65de77e42ab18a4f4db4" target="_blank" rel="noopener">https://github.com/tianocore/edk2-test/commit/814b2af535d977b3967d65de77e42ab18a4f4db4</a>