Merge branch 'mixed-mode' into efi-for-mingo