Merge master, efi branch