merge in lmp-release history after reset to 5e7504bb775ca19d3d5f5c7e4c46a47278f03c10