merge in lmp-release history after reset to 5acf587392f4d5f2aec9d0dac1f1261566573396