merge in lmp-release history after reset to 38f155ec41e9597420c5d7ee2c92387289132e33