merge in lmp-release history after reset to 346b8172081cfd49ffb83d2e261e140c533efd04