Pull request efi-2024-07-rc5 for branch master