Index: sipXconfig/plugins/polycom/etc/polycom/mac-address.cfg.vm
===================================================================
--- sipXconfig/plugins/polycom/etc/polycom/mac-address.cfg.vm	(revision 18494)
+++ sipXconfig/plugins/polycom/etc/polycom/mac-address.cfg.vm	(working copy)
@@ -27,9 +27,37 @@
    #set( $optional_root_url_path = "" )
 #end
 
+## External raw configuration fragments
+#set ( $raw_config_files = "" )
+
+## Include any exclusive config file
+#set ($fsetting = $cfg.Device.Settings.getSetting('feature'))
+#set ($xfile = false)
+#set ($xfile = $fsetting.getSetting('raw-config-file-exclusive').Value)
+#if ($xfile)
+  #set ( $raw_config_files = "${raw_config_files}${xfile}, " )
+#end
+
+## Include all cumulative config files
+##    First from the device itself
+#set ($tfile = false)
+#set ($cum-setting = $fsetting.getSetting('raw-config-file-cumulative'))
+#set ($tfile = $cum-setting.Value)
+#if ($tfile)
+  #set ( $raw_config_files = "${raw_config_files}${tfile}, " )
+#end
+##    and now from any groups that specify one
+#foreach ($grp in $cfg.Device.getGroups())
+  #set ($xfile = false)
+  #set ($xfile = $grp.getSettingValue($cum-setting))
+  #if ($xfile && $xfile != $tfile)
+    #set ( $raw_config_files = "${raw_config_files}${xfile}, " )
+  #end
+#end
+
 #macro( ModelSpecificAttributes $model $fw )
    APP_FILE_PATH${model}="${cfg.SipBinaryFilename}"
-   CONFIG_FILES${model}="${optional_license_files}${optional_root_url_path}[PHONE_MAC_ADDRESS]-sipx-sip.cfg, ${optional_root_url_path}[PHONE_MAC_ADDRESS]-sipx-phone.cfg, ${optional_root_url_path}[PHONE_MAC_ADDRESS]-sipx-device.cfg, polycom_phone1${fw}.cfg, polycom_sip${fw}.cfg"
+   CONFIG_FILES${model}="${raw_config_files}${optional_license_files}${optional_root_url_path}[PHONE_MAC_ADDRESS]-sipx-sip.cfg, ${optional_root_url_path}[PHONE_MAC_ADDRESS]-sipx-phone.cfg, ${optional_root_url_path}[PHONE_MAC_ADDRESS]-sipx-device.cfg, polycom_phone1${fw}.cfg, polycom_sip${fw}.cfg"
 #end
 
 #macro( ModelSpecificNode $model $fw )
Index: sipXconfig/plugins/polycom/etc/polycom/phone.properties
===================================================================
--- sipXconfig/plugins/polycom/etc/polycom/phone.properties	(revision 18494)
+++ sipXconfig/plugins/polycom/etc/polycom/phone.properties	(working copy)
@@ -1246,6 +1344,35 @@
 feature.corporate-directory.label=Corporate directory
 feature.corporate-directory.description=Corporate directory feature
 
+feature.raw-config-file-cumulative.label=Raw Polycom Config / Cumulative
+feature.raw-config-file-cumulative.description=File containing raw polycom \
+configuration directives in the config tftp server that is to be included \
+in the phones top level configuration path. This is included in the \
+config path before the managed configuration files and thus overrides \
+settings in later config files (Polycom's semantics). \
+Cumulative raw configuration files are included AFTER exclusive \
+raw configuration files. \
+Polycom special tags such as [PHONE_MAC_ADDRESS] and [PHONE_MODEL] \
+may be used. \
+If the phone and/or any groups have this option set ALL of the \
+config files are included ("cumulative") in the final configuration, the \
+phone file is first followed by each group config files in group priority \
+order. 
+
+feature.raw-config-file-exclusive.label=Raw Polycom Config / Exclusive
+feature.raw-config-file-exclusive.description=File containing raw polycom \
+configuration directives in the config tftp server that is to be included \
+in the phones top level configuration path. This is included in the \
+config path before all other configuration files and thus overrides \
+settings in all later config files (Polycom's semantics), including those \
+in the "cumulative" raw config files. \
+Polycom special tags such as [PHONE_MAC_ADDRESS] and [PHONE_MODEL] \
+may be used. \
+If the phone and/or any groups have this option set only the highest \
+priority setting is used (the phone specific one is highest priority, \
+followed by the setting in all the groups the phone is in -- this is \
+the same behavior as most other settings).
+
 mb.label=MicroBrowser
 mb.description=These settings control the home page and proxy to be used by the MicroBrowser  \
  when it is selected to provide services and also when it is used as part of the Idle  \
Index: sipXconfig/plugins/polycom/etc/polycom/phone.xml
===================================================================
--- sipXconfig/plugins/polycom/etc/polycom/phone.xml	(revision 18494)
+++ sipXconfig/plugins/polycom/etc/polycom/phone.xml	(working copy)
@@ -2078,6 +2195,18 @@
       </type>
       <value>0</value>
     </setting>
+    <setting name="raw-config-file-cumulative" advanced="yes">
+      <type>
+        <string />
+      </type>
+      <value></value>
+    </setting>
+    <setting name="raw-config-file-exclusive" advanced="yes">
+      <type>
+        <string />
+      </type>
+      <value></value>
+    </setting>
   </group>
   <group name="mb">
     <setting name="proxy">