merge in lmp-release history after reset to e25590a998c05297fb151bdf089a292b5d0b59f0