merge in lmp-release history after reset to 1d5d6098f4a470bc8e56ae8914180041815e6e22