am bfa45cdd: Merge "Change reference processing to use heap references."

* commit 'bfa45cdda3e65cefb61fdbe75e8f4c13087d4641':
  Change reference processing to use heap references.