merge in lmp-release history after reset to 4d2793783bdaa1d74b1998f088d1b68d24560599