merge in lmp-release history after reset to a0697c5b879f48ad009192028b34578eae42f394