merge in lmp-release history after reset to 1d12f186edcaaf6ebd6ace1929baa23ce97a2ab8