merge in lmp-release history after reset to fb368ce3e20b25dd3819bff20f76eae24ce1b8ab