merge in lmp-release history after reset to b1982b75c4f3d9c812d9c49ca294132430c7cd8d