merge in lmp-release history after reset to a9162906f262477fd187704cfe5819e8c323c60d