merge in lmp-release history after reset to 380757ba5c927015d403e3b97cc418413330453e