Merge "fix: avoid redefinition of 'efi_guid' structure" into integration