merge in lmp-release history after reset to 2efc9d994ce59f9ebfc2290c2adc5d760e8939c2