Merge "Fix heap check."