3.4.37, 3.4.36-rt50, merges some changes form master
make it work with efi, simplify a bit