Had an offline discussion with Pierre. Apparently there are additional issues that need to be fixed. So, please ignore this patch series and instead use the patch series from Pierre at https://edk2.groups.io/g/devel/message/99012 Regards, Sami Mujawar