merge in lmp-release history after reset to 87fca6f34c10e43e4dcfdd3f4e35bd4050e19582