Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	14 Jul 2015 22:26:56 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	29 Aug 2015 10:10:34 -0000	1.6.2.1
@@ -10,7 +10,7 @@
  <li><a href="../group-types/one?group_type=@group_types.group_type_enc@">@group_types.type_pretty_name@</a>
  <ul>
  <if @group_types.number_groups@ lt 25>
-   <include src="../group-types/groups-list" group_type="@group_types.group_type;literal@">
+   <include ds="0" src="../group-types/groups-list" group_type="@group_types.group_type;literal@">
  </if>
  <else>
    <li> <a href="../group-types/groups-display?group_type=@group_types.group_type_enc@">View all @group_types.number_groups@ groups</a></li>
Index: openacs-4/packages/acs-templating/resources/dimensionals/dimensional.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/dimensionals/dimensional.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-templating/resources/dimensionals/dimensional.adp	27 Aug 2015 08:22:45 -0000	1.1.2.1
+++ openacs-4/packages/acs-templating/resources/dimensionals/dimensional.adp	29 Aug 2015 10:10:34 -0000	1.1.2.2
@@ -4,6 +4,6 @@
 </multiple></tr>
 <tr>
 <multiple name="dimensional">
-<include src="dimensional-option" &opt="opt_@dimensional.key;literal@" key="@dimensional.key;literal@" label="@dimensional.label;literal@">
+<include ds="0" src="dimensional-option" &opt="opt_@dimensional.key;literal@" key="@dimensional.key;literal@" label="@dimensional.label;literal@">
 </multiple>
 </table>
\ No newline at end of file
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.39.2.1 -r1.39.2.2
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	17 Aug 2015 17:50:27 -0000	1.39.2.1
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	29 Aug 2015 10:10:34 -0000	1.39.2.2
@@ -97,9 +97,10 @@
 template_tag include { params } {
 
   set src [ns_set iget $params src]
-
+  set ds [ns_set iget $params ds 1]
+  
   #Start developer support frame around subordinate template.
-  if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne "" } {
+  if { $ds && [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne "" } {
       ::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
   }
 
@@ -632,9 +633,10 @@
 template_tag include-optional { chunk params } {
 
   set src [ns_set iget $params src]
+  set ds [ns_set iget $params ds 1]
 
   #Start developer support frame around subordinate template.
-  if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne ""} {
+  if { $ds && [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne ""} {
       ::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
   }