merge HP boot fix

No match.