Merge change Ia8e64a7c

* changes:
  Fix an invoke-interface bug that manifests itself with thread state warnings.