merge in lmp-release history after reset to c4ef996e8a7e2d23a4d5e5732848a3e06b9fbb3a