merge in lmp-release history after reset to 4a20b09adc9f21eb3c629f54c2589383267c4199