Had an offline discussion with Pierre. Apparently there are additional issues that need to be fixed.<br />So, please ignore this patch series and instead use the patch series from Pierre at <a href="https://edk2.groups.io/g/devel/message/99012" target="_blank" rel="noopener">https://edk2.groups.io/g/devel/message/99012</a><br /><br />Regards,<br /><br />Sami Mujawar