merge in lmp-release history after reset to 69b87c3bc112bee8e6f0b427f55a54068e093b2c