merge in lmp-release history after reset to 60493b329f690a54626827ea364422f72b8c4a29