Merge changes Ied2ab927,I16245af7

* changes:
  Silently ignore duplicate heap entries
  Handle segfaults while walking native heap