Merge tag 'v3.9' into efi-for-tip2