merge in lmp-release history after reset to b01e4e2c73159d39b8ba9d4437f550adb170295e