merge in lmp-release history after reset to e3386105e31971378386ef2fe8480aacfc082ea0