merge in lmp-release history after reset to ca6804a654509716d30919fea76424ec3fc8eff4