merge in lmp-release history after reset to 24a493a9eaeea374b2a7f2f36247102722b1d957