Merge "Catch SIGBUS in HeapWalker"