merge in lmp-release history after reset to 65a55b618f605950a0120e24067763b973795970