diff --git a/resources/templates/provision/grandstream/wp8x6/phonebook.xml b/resources/templates/provision/grandstream/wp8x6/phonebook.xml
new file mode 100644
index 0000000000..8d0d0969ca
--- /dev/null
+++ b/resources/templates/provision/grandstream/wp8x6/phonebook.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+ 1
+ Users
+ default ringtone
+
+
+ 2
+ Groups
+ default ringtone
+
+
+ 3
+ Extensions
+ system
+
+
+ {$start_id=0}
+ {foreach $contacts as $row}
+ {if $row.category == "users"}
+
+ {$start_id++}
+ {if $row.contact_name_given != ""}
+ {if $row.contact_organization != ""}
+ {$row.contact_name_given} {$row.contact_name_family}
+ {$row.contact_name_given} {$row.contact_name_family}
+ {$row.contact_organization}
+ {else}
+ {$row.contact_name_given}
+ {$row.contact_name_family}
+ {/if}
+ {else}
+ {$row.effective_caller_id_name}
+ {/if}
+
+ 0
+ {foreach $row.numbers as $number}
+ {if $number.phone_number != ""}
+ {if $number.phone_label == "work"}
+
+ {$number.phone_number}
+ 0
+
+ {/if}
+ {if $number.phone_label == "home"}
+
+ {$number.phone_number}
+ 0
+
+ {/if}
+ {if $number.phone_label == "mobile"}
+
+ {$number.phone_number}
+ 0
+
+ {/if}
+ {/if}
+ {/foreach}
+ 1
+ 0
+
+
+
+
+ {elseif $row.category == "groups"}
+
+ {$start_id++}
+ {if $row.contact_name_given != ""}
+ {if $row.contact_organization != ""}
+ {$row.contact_name_given} {$row.contact_name_family}
+ {$row.contact_name_given} {$row.contact_name_family}
+ {$row.contact_organization}
+ {else}
+ {$row.contact_name_given}
+ {$row.contact_name_family}
+ {/if}
+ {else}
+ {$row.effective_caller_id_name}
+ {/if}
+
+
+ 0
+ {foreach $row.numbers as $number}
+ {if $number.phone_number != ""}
+ {if $number.phone_label == "work"}
+
+ {$number.phone_number}
+ 0
+
+ {/if}
+ {if $number.phone_label == "home"}
+
+ {$number.phone_number}
+ 0
+
+ {/if}
+ {if $number.phone_label == "mobile"}
+
+ {$number.phone_number}
+ 0
+
+ {/if}
+ {/if}
+ {/foreach}
+ 2
+ 0
+
+
+
+
+ {elseif $row.category == "extensions"}
+
+ {$start_id++}
+ {if $row.contact_name_given != ""}
+ {if $row.contact_organization != ""}
+ {$row.contact_name_given} {$row.contact_name_family}
+ {$row.contact_name_given} {$row.contact_name_family}
+ {$row.contact_organization}
+ {else}
+ {$row.contact_name_given}
+ {$row.contact_name_family}
+ {/if}
+ {else}
+ {$row.effective_caller_id_name}
+ {/if}
+
+ 0
+ {if $row.phone_number != ""}
+
+ {$row.phone_number}
+ 0
+
+ {else}
+
+ {$row.phone_extension}
+ 0
+
+ {/if}
+ 3
+ 0
+
+
+
+
+ {/if}
+ {/foreach}
+
+
\ No newline at end of file
diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml
new file mode 100644
index 0000000000..16e318b27e
--- /dev/null
+++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml
@@ -0,0 +1,4029 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {for $line=1 to 3}
+ {$row=$lines.$line}
+
+
+ - {if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}
+
+
+ - {$row.display_name}
+
+
+ - {$row.server_address}:{$row.sip_port}
+
+
+ - {$row.secondary_server_address}
+
+
+ - {if isset($row.outbound_proxy_primary)}{$row.outbound_proxy_primary}:{$row.sip_port}{/if}
+
+
+ - {if isset($row.outbound_proxy_secondary)}{$row.outbound_proxy_secondary}:{$row.sip_port}{/if}
+
+
+ - {$row.user_id}
+
+
+ - {$row.auth_id}
+
+
+ - {$row.password}
+
+
+ - {$row.display_name}
+
+
+
+ - {$voicemail_number}
+
+
+
+ - {$row.user_id}
+
+
+ - {$grandstream_dns_mode}
+
+
+
+ - {$line_register_expires}
+
+
+
+ - {if filter_var($subscribe_mwi_to_vm, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}
+
+
+
+ - {if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}Tls Or Tcp{else}UDP{/if}
+
+
+
+ - {$row.sip_port}
+
+
+
+ - {$outbound_proxy_primary}
+
+
+
+ - G.722
+ - OPUS
+ - PCMU
+ - PCMA
+ - G.723.1
+ - G.729A/B
+ - iLBC
+ - G.726-32
+
+
+
+ - {$grandstream_srtp}
+
+
+
+ - {$row.sip_port}
+
+
+
+ - Pound
+
+
+
+ - {$grandstream_dial_plan}
+
+
+
+
+ - {$grandstream_account_ring_tone_1}
+ {/if}
+
+
+ {if isset($grandstream_account_ring_tone_1)}
+
+ - {$grandstream_account_ring_tone_1}
+ {/if}
+
+
+ {if isset($grandstream_account_ringtone_name_2)}
+ - {$grandstream_distinctive_ringtone_name_2}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_2)}
+ - {$grandstream_distinctive_ringtone_2}
+ {/if}
+
+
+
+ {if isset($grandstream_distinctive_ringtone_name_3)}
+ - {$grandstream_distinctive_ringtone_name_3}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_3)}
+ - {$grandstream_distinctive_ringtone_3}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_name_4)}
+ - {$grandstream_distinctive_ringtone_name_4}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_4)}
+ - {$grandstream_distinctive_ringtone_4}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_name_5)}
+ - {$grandstream_distinctive_ringtone_name_5}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_5)}
+ - {$grandstream_distinctive_ringtone_5}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_name_6)}
+ - {$grandstream_distinctive_ringtone_name_6}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_6)}
+ - {$grandstream_distinctive_ringtone_6}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_name_7)}
+ - {$grandstream_distinctive_ringtone_name_7}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_7)}
+ - {$grandstream_distinctive_ringtone_7}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_name_8)}
+ - {$grandstream_distinctive_ringtone_name_8}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_8)}
+ - {$grandstream_distinctive_ringtone_8}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_name_9)}
+ - {$grandstream_distinctive_ringtone_name_9}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_9)}
+ - {$grandstream_distinctive_ringtone_9}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_name_10)}
+ - {$grandstream_distinctive_ringtone_name_10}
+ {/if}
+
+
+ {if isset($grandstream_distinctive_ringtone_10)}
+ - {$grandstream_distinctive_ringtone_10}
+ {/if}
+
+
+
+
+
+
+
+
+ - { x+(xxxx)xxxx | xx(xx+)xx | x(xx+)x | x(x+) | (x+)}
+
+
+
+
+
+
+ - Yes
+
+
+ - 20
+
+
+ - Yes
+
+
+ - Local,Remote,BSXSI,LDAPPhonebook,NETWorkSignaling
+
+
+
+
+
+
+ - LocalPhonebook,CallHistory,BSPhonebook,BSCallHistory,LDAPPhonebook,PersonalPhonebook,RemotePhonebook,FeatureCode
+
+
+
+ - [()-]
+
+
+
+ - f1=440,f2=480,c=200/400;
+
+
+
+
+ - f1=350,f2=440;
+
+
+
+
+ - f1=350,f2=440;
+
+
+
+
+ - f1=350,f2=440,c=10/10;
+
+
+
+
+ - f1=440,f2=480,c=200/400;
+
+
+
+
+ - f1=440,f2=440,c=25/525;
+
+
+
+ - Low
+
+
+
+ - medium
+
+
+
+
+ - f1=480,f2=620,c=50/50;
+
+
+
+
+ - f1=480,f2=620,c=25/25;
+
+
+
+ - channel(*)
+
+
+
+ - On
-->
+
+
+
+ - Auto
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - {$grandstream_wifi_essid}
+
+
+
+ - WPA-PSK
+
+
+ - {$grandstream_wifi_password}
+
+
+
+ - PWD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Custom-Menu,Custom-History
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - EndCall,Backspace,Dial,Custom-Contacts,Custom-History
+
+
+
+ - Answer,Reject,Forward,Custom-Silence
+
+
+
+ - EndCall,ConfCall
+
+
+
+ - EndCall,ConfCall,NewCall,Swap,Transfer,Record,Custom-Hold,Custom-NoiseShield,DialDTMF
+
+
+
+ - EndCall,Resume,NewCall,ConfCall,Swap,Transfer
+
+
+
+ - EndCall,Redial
+
+
+
+ - Cancel,Backspace,Transfer,Custom-Contacts,Custom-History
+
+
+
+ - Cancel,Dial,Backspace,Custom-Contacts,Custom-History
+
+
+
+ - EndCall,ConfRoom,Custom-Hold,Add,Custom-NoiseShield
+
+
+
+ - EndCall,Backspace,Dial,Custom-Contacts,Custom-History
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - {$grandstream_gxp_time_zone}
+
+
+ - 0
+
+
+
+
+ - {$grandstream_gxp_time_zone}
+
+
+
+
+
+
+
+ - {$grandstream_date_display}
+
+
+
+ - {$time_format}
+
+
+
+
+
+
+
+
+
+
+
+ - Automatic
+
+
+
+
+
+
+ - {$admin_password}
+
+
+
+
+
+
+ - 112,911,110
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - {$grandstream_tr069_enable}
+
+
+ - {$grandstream_acs_url}
+
+
+ - {$grandstream_tr069_periodic_inform_enable}
+
+
+ - 300
+
+
+ - 1
+
+
+ - {$grandstream_firmware_path}
+
+
+ - 2
+
+
+
+ - {$grandstream_config_server_path}
+
+
+ - {$http_auth_username}
+
+
+ - {$http_auth_password}
+
+
+ - 0
+
+
+ - {$grandstream_automatic_provisioning}
+
+
+
+ - 0
+
+
+
+ - 0
+
+
+ - 0
+
+
+ - Overview,PacketLostRate,RoundTripDelay,Jitter,MosLQ,MosCQ
+
+
+
+
+
+ - geodetic,civic,locationURI
+
+
+ - 911
+
+
+