merge in lmp-release history after reset to 1b1d8b0c3f29b2520554602eb72c0e9456efa5ac