merge in lmp-release history after reset to 52579125e2e3b837e92e6f09b0b1e08e897a5aa7