merge in lmp-release history after reset to 91b9d01b6ba2d3ea37928febce67d13c005a2336