merge in lmp-release history after reset to 319a20297d4926ac3641302f81c31028a43968a2