merge in lmp-release history after reset to c6344faeff899655abd60b3bf4cd638e58bcc3d7