merge in lmp-release history after reset to 6df7b609984479c894be81140730578896dbdd8f