merge in lmp-release history after reset to 0406189c5c0f168f6a963ee3877012e003558147