merge in lmp-release history after reset to b1c010d64b97131cf87bdf1968962f12458bc247