Index: /branches/release-33/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-33/lib/MT/Template/ContextHandlers.pm (revision 1677)
+++ /branches/release-33/lib/MT/Template/ContextHandlers.pm (revision 1725)
@@ -2377,4 +2377,5 @@
             return $ctx->error($builder->errstr);
         }
+        $tmpl->tokens( $tokens );
 
         $req->stash($stash_id, [ $tmpl, $tokens ]);
@@ -2382,5 +2383,5 @@
 
     # Build the included template against the includ*ing* template's context.
-    my $ret = $builder->build($ctx, $tokens, $cond);
+    my $ret = $tmpl->build( $ctx, $cond );
     if (!defined $ret) {
         $req->cache('build_template', $tmpl) if $tmpl;
Index: /branches/release-33/lib/MT/Template.pm
===================================================================
--- /branches/release-33/lib/MT/Template.pm (revision 1658)
+++ /branches/release-33/lib/MT/Template.pm (revision 1725)
@@ -261,4 +261,5 @@
         $ctx->var( 'page_columns', $columns ) if $columns;
     }
+    $ctx->var( $tmpl->identifier, 1 ) if defined $tmpl->identifier;
 
     $timer->pause_partial if $timer;