Merge "Fix heap verification and add runtime options."