merge in lmp-release history after reset to 6f44803f0def3dc9b181529473c27a4b8987a2d3