merge in lmp-release history after reset to c24ad043772e5b2b36ee18560fc22ff0391bb80c