merge in lmp-release history after reset to 6f1d031b39ca2c666edab5ce966d1329f85dee1e