merge in lmp-release history after reset to c0d17e349901c3ccf6d15b7dcdf7fa30139c9750