merge in lmp-release history after reset to b4ced6163bf7704942314a12a7650589cd4a4fc1