Merge "Fix heap poisoning build"