Merge "Fix heap check." into nyc-dev