merge HP boot fix