diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php
index 699198ddcf..e1038f8544 100644
--- a/app/polycom/app_config.php
+++ b/app/polycom/app_config.php
@@ -430,5 +430,76 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Fixed";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Disabled, Fixed or Custom";
-
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f402600f-c31a-471f-95e4-28b5e8c1c42b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_pagination_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "0 (default) – Disables the pagination feature. 1 – Enables the pagination feature.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fc0c17d4-bd64-4523-ac16-4f3b3da181e9";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_softkey_newcall";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Newcall Softkey 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "97eae52e-0a66-4a97-83d0-922eaa919f86";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_softkey_directories";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Directories Softkey 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9b854a6b-10dc-4de6-a268-dc17a6f0750a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_homescreen_forward";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Home Screen Forward option 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8cc668ef-9c94-4f43-b287-b6dcdfaebcd3";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_homescreen_directories";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Home Screen Directories option 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5bd3bf50-6d8f-42eb-85ca-c463c9c1d63d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_homescreen_do_not_disturb";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Home Screen Do Not Disturb option 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a16eda84-d585-41f5-921e-bd8d3382458d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_basic_call_management_redundant";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable to display redundant call management functions for the soft keys. 1 (default) - Enabled. 0 - Disabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5f7e8466-2c82-4092-aa19-bc8af99d05b5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_pickup_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Pickup softkey  0=Disabled - 1=Enabled ";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "eabcfacc-64be-457a-ad7f-1d53e27e9eaf";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_pickup_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Pick up softkey  0=Disabled - 1=Enabled ";
 ?>
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index d80c1b016a..2e7c70ce85 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -246,21 +246,56 @@
 			msg.mwi.{$row.line_number}.callBackMode="contact"
 			msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
 		{/foreach}
-		feature.intercom.enable="{$polycom_intercom_enable}"
 		{if isset($polycom_diversion_header)}voIpProt.SIP.header.diversion.enable="{$polycom_diversion_header}"{/if}
 		reg.1.server.1.subscribe.expires="2592000"
 		{if isset($polycom_contacts_directory)}contacts_directory="{$polycom_contacts_directory}/{$domain_name}/"{/if}
+		{if isset($polycom_pagination_enabled)}up.Pagination.enabled="{$polycom_pagination_enabled}"{/if}
 	/>
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
 		softkey.1.action="^*99$P1N4$$Trefer$"
 		softkey.1.enable="1"
 		softkey.1.use.active="1"
+		softkey.1.precede="1"
 		efk.efkprompt.1.label="Voice Mail ID to transfer to:"
 		efk.efkprompt.1.status="1"
 		efk.efkprompt.1.type="numeric"
+		{if isset($polycom_intercom_enable)}
+		softkey.2.label="Intercom"
+		softkey.2.action="^*8$P2N4$$Tinvite$"
+		softkey.2.enable="1"
+		softkey.2.use.idle="1"
+		efk.efkprompt.2.label="Enter destination"
+		efk.efkprompt.2.status="1"
+		efk.efkprompt.2.type="numeric"
+		efk.efkprompt.2.userfeedback="visible"
+		efk.efkprompt.2.digitmatching="none"
+		{/if}
+		{if isset($polycom_pickup_enable)}
+		softkey.3.label="Pick up"
+		softkey.3.action="^**$P3N4$$Tinvite$"
+		softkey.3.enable="1"
+		softkey.3.use.idle="1"
+		efk.efkprompt.3.label="Enter ext to intercept"
+		efk.efkprompt.3.status="1"
+		efk.efkprompt.3.type="numeric"
+		efk.efkprompt.3.userfeedback="visible"
+		efk.efkprompt.3.digitmatching="none"
+		{/if}
 		{if isset($polycom_softkey_do_not_disturb)}softkey.feature.doNotDisturb="{$polycom_softkey_do_not_disturb}"{/if}
 		{if isset($polycom_softkey_forward)}softkey.feature.forward="{$polycom_softkey_forward}"{/if}
+		{if isset($polycom_softkey_newcall)}softkey.feature.newcall="{$polycom_softkey_newcall}"{/if}
+		{if isset($polycom_softkey_directories)}softkey.feature.directories="{$polycom_softkey_directories}"{/if}
+		{if isset($polycom_basic_call_management_redundant)}
+		softkey.feature.basicCallManagement.redundant="{$polycom_basic_call_management_redundant}"
+		efk.softkey.alignleft="1"
+		{/if}
+	/>
+	<HOME_SCREEN
+		{if isset($polycom_homescreen_do_not_disturb)}homeScreen.doNotDisturb.enable="{$polycom_homescreen_do_not_disturb}"{/if}
+		{if isset($polycom_homescreen_forward)}homeScreen.forward.enable="{$polycom_homescreen_forward}"{/if}
+		{if isset($polycom_homescreen_directories)}homeScreen.directories.enable="{$polycom_homescreen_directories}"{/if}
+		homeScreen.intercom.enable="0"
 	/>
 	<USB 
 		feature.callRecording.enabled="0"
@@ -282,10 +317,6 @@
 		device.dhcp.bootSrvUseOpt.set="1"
 		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
 		{/if}
-		{if isset($polycom_boot_server_option)}
-		device.dhcp.bootSrvUseOpt.set="1"
-		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
-		{/if}
 		{if isset($polycom_lldp_enabled)}
 		device.net.lldpEnabled.set="1"
 		device.net.lldpEnabled="{$polycom_lldp_enabled}"
diff --git a/resources/templates/provision/polycom/6.x/{$mac}.cfg b/resources/templates/provision/polycom/6.x/{$mac}.cfg
index d80c1b016a..2e7c70ce85 100644
--- a/resources/templates/provision/polycom/6.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/6.x/{$mac}.cfg
@@ -246,21 +246,56 @@
 			msg.mwi.{$row.line_number}.callBackMode="contact"
 			msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
 		{/foreach}
-		feature.intercom.enable="{$polycom_intercom_enable}"
 		{if isset($polycom_diversion_header)}voIpProt.SIP.header.diversion.enable="{$polycom_diversion_header}"{/if}
 		reg.1.server.1.subscribe.expires="2592000"
 		{if isset($polycom_contacts_directory)}contacts_directory="{$polycom_contacts_directory}/{$domain_name}/"{/if}
+		{if isset($polycom_pagination_enabled)}up.Pagination.enabled="{$polycom_pagination_enabled}"{/if}
 	/>
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
 		softkey.1.action="^*99$P1N4$$Trefer$"
 		softkey.1.enable="1"
 		softkey.1.use.active="1"
+		softkey.1.precede="1"
 		efk.efkprompt.1.label="Voice Mail ID to transfer to:"
 		efk.efkprompt.1.status="1"
 		efk.efkprompt.1.type="numeric"
+		{if isset($polycom_intercom_enable)}
+		softkey.2.label="Intercom"
+		softkey.2.action="^*8$P2N4$$Tinvite$"
+		softkey.2.enable="1"
+		softkey.2.use.idle="1"
+		efk.efkprompt.2.label="Enter destination"
+		efk.efkprompt.2.status="1"
+		efk.efkprompt.2.type="numeric"
+		efk.efkprompt.2.userfeedback="visible"
+		efk.efkprompt.2.digitmatching="none"
+		{/if}
+		{if isset($polycom_pickup_enable)}
+		softkey.3.label="Pick up"
+		softkey.3.action="^**$P3N4$$Tinvite$"
+		softkey.3.enable="1"
+		softkey.3.use.idle="1"
+		efk.efkprompt.3.label="Enter ext to intercept"
+		efk.efkprompt.3.status="1"
+		efk.efkprompt.3.type="numeric"
+		efk.efkprompt.3.userfeedback="visible"
+		efk.efkprompt.3.digitmatching="none"
+		{/if}
 		{if isset($polycom_softkey_do_not_disturb)}softkey.feature.doNotDisturb="{$polycom_softkey_do_not_disturb}"{/if}
 		{if isset($polycom_softkey_forward)}softkey.feature.forward="{$polycom_softkey_forward}"{/if}
+		{if isset($polycom_softkey_newcall)}softkey.feature.newcall="{$polycom_softkey_newcall}"{/if}
+		{if isset($polycom_softkey_directories)}softkey.feature.directories="{$polycom_softkey_directories}"{/if}
+		{if isset($polycom_basic_call_management_redundant)}
+		softkey.feature.basicCallManagement.redundant="{$polycom_basic_call_management_redundant}"
+		efk.softkey.alignleft="1"
+		{/if}
+	/>
+	<HOME_SCREEN
+		{if isset($polycom_homescreen_do_not_disturb)}homeScreen.doNotDisturb.enable="{$polycom_homescreen_do_not_disturb}"{/if}
+		{if isset($polycom_homescreen_forward)}homeScreen.forward.enable="{$polycom_homescreen_forward}"{/if}
+		{if isset($polycom_homescreen_directories)}homeScreen.directories.enable="{$polycom_homescreen_directories}"{/if}
+		homeScreen.intercom.enable="0"
 	/>
 	<USB 
 		feature.callRecording.enabled="0"
@@ -282,10 +317,6 @@
 		device.dhcp.bootSrvUseOpt.set="1"
 		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
 		{/if}
-		{if isset($polycom_boot_server_option)}
-		device.dhcp.bootSrvUseOpt.set="1"
-		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
-		{/if}
 		{if isset($polycom_lldp_enabled)}
 		device.net.lldpEnabled.set="1"
 		device.net.lldpEnabled="{$polycom_lldp_enabled}"