merge in lmp-release history after reset to dc2e6ddc933e40632e79a866d9ece870db1a975e