merge in lmp-release history after reset to 5c8a816e781753215be279986764dcdc4dd26b3f