merge in lmp-release history after reset to bc0a9c240b672f00f050cdbf116eef7bb2b448db