merge in lmp-release history after reset to e6e18e8de729316b3fac7733f9ebc7f1b3feba95