diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php
index e5890dd82a..d6e21d7bdc 100644
--- a/app/access_controls/access_control_edit.php
+++ b/app/access_controls/access_control_edit.php
@@ -38,6 +38,9 @@
 	$language = new text;
 	$text = $language->get();
 
+//create the database connection
+	$database = database::new();
+
 //action add or update
 	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 		$action = "update";
@@ -93,20 +96,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('access_control_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('access_control_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('access_control_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -229,7 +229,6 @@
 
 		//save the data
 			if (is_array($array)) {
-				$database = new database;
 				$database->app_name = 'access controls';
 				$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
 				$database->save($array);
@@ -266,7 +265,7 @@
 		$sql = "select * from v_access_controls ";
 		$sql .= "where access_control_uuid = :access_control_uuid ";
 		$parameters['access_control_uuid'] = $access_control_uuid;
-		$database = new database;
+
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row) && count($row) > 0) {
 			$access_control_name = $row["access_control_name"];
@@ -282,7 +281,6 @@
 		$sql .= "where access_control_uuid = :access_control_uuid ";
 		$sql .= "order by node_cidr asc";
 		$parameters['access_control_uuid'] = $access_control_uuid;
-		$database = new database;
 		$access_control_nodes = $database->select($sql, $parameters, 'all');
 		unset ($sql, $parameters);
 	}
@@ -326,6 +324,9 @@
 		if (permission_exists('access_control_node_add')) {
 			echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'style'=>'margin-right: 3px;','link'=>'access_control_import.php?id='.escape($access_control_uuid)]);
 		}
+		if (permission_exists('access_control_node_view')) {
+			echo button::create(['type'=>'button','label'=>$text['button-export'],'icon'=>$_SESSION['theme']['button_icon_export'],'style'=>'margin-right: 3px;','link'=>'access_control_export.php?id='.escape($access_control_uuid)]);
+		}
 		if (permission_exists('access_control_node_add')) {
 			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]);
 		}
diff --git a/app/access_controls/access_control_export.php b/app/access_controls/access_control_export.php
new file mode 100644
index 0000000000..77cdb88160
--- /dev/null
+++ b/app/access_controls/access_control_export.php
@@ -0,0 +1,185 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2024
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+//includes files
+	require_once dirname(__DIR__, 2) . "/resources/require.php";
+	require_once "resources/check_auth.php";
+	require_once "resources/paging.php";
+
+//check permissions
+	if (permission_exists('access_control_node_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//initialize the database object
+	$database = new database;
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//define available columns
+	$available_columns[] = 'node_type';
+	$available_columns[] = 'node_cidr';
+	$available_columns[] = 'node_description';
+	$available_columns[] = 'insert_date';
+	$available_columns[] = 'insert_user';
+	$available_columns[] = 'update_date';
+	$available_columns[] = 'update_user';
+
+//action add or update
+	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
+		$access_control_uuid = $_REQUEST["id"];
+	}
+
+//define the functions
+	function array2csv(array &$array) {
+		if (count($array) == 0) {
+			return null;
+		}
+		ob_start();
+		$df = fopen("php://output", 'w');
+		fputcsv($df, array_keys(reset($array)));
+		foreach ($array as $row) {
+			fputcsv($df, $row);
+		}
+		fclose($df);
+		return ob_get_clean();
+	}
+
+//send download headers
+	function download_send_headers($filename) {
+		// disable caching
+		$now = gmdate("D, d M Y H:i:s");
+		header("Expires: Tue, 03 Jul 2001 06:00:00 GMT");
+		header("Cache-Control: max-age=0, no-cache, must-revalidate, proxy-revalidate");
+		header("Last-Modified: {$now} GMT");
+
+		// force download
+		header("Content-Type: application/force-download");
+		header("Content-Type: application/octet-stream");
+		header("Content-Type: application/download");
+
+		// disposition / encoding on response body
+		header("Content-Disposition: attachment;filename={$filename}");
+		header("Content-Transfer-Encoding: binary");
+	}
+
+//get the extensions from the database and send them as output
+	if (!empty($_REQUEST["column_group"]) && is_array($_REQUEST["column_group"]) && @sizeof($_REQUEST["column_group"]) != 0) {
+
+		//validate the token
+			$token = new token;
+			if (!$token->validate($_SERVER['PHP_SELF'])) {
+				message::add($text['message-invalid_token'],'negative');
+				header('Location: access_control_export.php');
+				exit;
+			}
+
+		//validate submitted columns
+		foreach ($_REQUEST["column_group"] as $column_name) {
+			if (in_array($column_name, $available_columns)) {
+				$selected_columns[] = $column_name;
+			}
+		}
+		if (!empty($access_control_uuid) && is_uuid($access_control_uuid) && is_array($selected_columns) && @sizeof($selected_columns) != 0) {
+			//get the child data
+			$sql = "select ".implode(', ', $selected_columns)." from v_access_control_nodes ";
+			$sql .= "where access_control_uuid = :access_control_uuid ";
+			$sql .= "order by node_cidr asc";
+			$parameters['access_control_uuid'] = $access_control_uuid;
+			$access_control_nodes = $database->select($sql, $parameters, 'all');
+			unset($sql, $parameters, $selected_columns);
+
+			//send the download headers
+			download_send_headers("access_control_export_".date("Y-m-d").".csv");
+
+			//output the data
+			echo array2csv($access_control_nodes);
+			exit;
+		}
+	}
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//include the header
+	$document['title'] = $text['title-access_control_export'];
+	require_once "resources/header.php";
+
+//show the content
+	echo "<form method='post' name='frm' id='frm'>\n";
+
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['header-access_control_export']."</b></div>\n";
+	echo "	<div class='actions'>\n";
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'access_control_edit.php?id='.$access_control_uuid]);
+	echo button::create(['type'=>'submit','label'=>$text['button-export'],'icon'=>$_SESSION['theme']['button_icon_export'],'id'=>'btn_save','style'=>'margin-left: 15px;']);
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
+
+	echo $text['description-access_control_export'];
+	echo "<br /><br />\n";
+
+	echo "<div class='card'>\n";
+	echo "<table class='list'>\n";
+	echo "<tr class='list-header'>\n";
+	echo "	<th class='checkbox'>\n";
+	echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".(empty($available_columns) ? "style='visibility: hidden;'" : null).">\n";
+	echo "	</th>\n";
+	echo "	<th>".$text['label-column_name']."</th>\n";
+	echo "</tr>\n";
+
+	if (!empty($available_columns) && is_array($available_columns) && @sizeof($available_columns) != 0) {
+		$x = 0;
+		foreach ($available_columns as $column_name) {
+			$list_row_onclick = "if (!this.checked) { document.getElementById('checkbox_all').checked = false; }";
+			echo "<tr class='list-row'>\n";
+			echo "	<td class='checkbox'>\n";
+			echo "		<input type='checkbox' name='column_group[]' id='checkbox_".$x."' value=\"".$column_name."\" onclick=\"".$list_row_onclick."\">\n";
+			echo "	</td>\n";
+			echo "	<td onclick=\"document.getElementById('checkbox_".$x."').checked = document.getElementById('checkbox_".$x."').checked ? false : true; ".$list_row_onclick."\">".$column_name."</td>";
+			echo "</tr>";
+			$x++;
+		}
+	}
+
+	echo "</table>\n";
+	echo "</div>\n";
+	echo "<br />\n";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "</form>\n";
+
+//include the footer
+	require_once "resources/footer.php";
+
+?>
diff --git a/app/access_controls/app_config.php b/app/access_controls/app_config.php
index 588ba9857b..e6a197ff9c 100644
--- a/app/access_controls/app_config.php
+++ b/app/access_controls/app_config.php
@@ -55,7 +55,6 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "access_control_node_delete";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
 
 	//cache details
 		$apps[$x]['cache']['key'] = "configuration.acl.conf";
@@ -73,7 +72,7 @@
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';		
+		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_default";
diff --git a/app/access_controls/app_languages.php b/app/access_controls/app_languages.php
index 9bb77aa61e..1b098a8182 100644
--- a/app/access_controls/app_languages.php
+++ b/app/access_controls/app_languages.php
@@ -108,32 +108,59 @@ $text['title-access_control']['zh-cn'] = "访问控制";
 $text['title-access_control']['ja-jp'] = "アクセス制御";
 $text['title-access_control']['ko-kr'] = "액세스 제어";
 
-$text['title_description-access_controls']['en-us'] = "Access control list can allow or deny ranges of IP addresses.";
-$text['title_description-access_controls']['en-gb'] = "Access control list can allow or deny ranges of IP addresses.";
-$text['title_description-access_controls']['ar-eg'] = "قائمة التحكم بالوصول يمكن السماح أو الرفض نطاقات العناوين.";
-$text['title_description-access_controls']['de-at'] = "Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen.";
-$text['title_description-access_controls']['de-ch'] = "Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen.";
-$text['title_description-access_controls']['de-de'] = "Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen.";
-$text['title_description-access_controls']['el-gr'] = "Access control list can allow or deny ranges of IP addresses";
-$text['title_description-access_controls']['es-cl'] = "Lista de control de acceso puede permitir o denegar los rangos de direcciones IP.";
-$text['title_description-access_controls']['es-mx'] = "Lista de control de acceso puede permitir o denegar los rangos de direcciones IP.";
-$text['title_description-access_controls']['fr-ca'] = "Liste de contrôle d'accès peut autoriser ou refuser des plages d'adresses IP.";
-$text['title_description-access_controls']['fr-fr'] = "Liste de contrôle d'accès peut autoriser ou refuser des plages d'adresses IP.";
-$text['title_description-access_controls']['he-il'] = " רשימת בקרת גישה יכולה לאפשר או למנוע טווחים של כתובות IP.";
-$text['title_description-access_controls']['it-it'] = "Le liste per il controllo di accesso permettono o negano l'accesso a range di IP.";
-$text['title_description-access_controls']['ka-ge'] = "წვდომის კონტროლის სიას IP მისამართების შუალედების დაშვება ან აკრძალვა შეუძლია";
-$text['title_description-access_controls']['nl-nl'] = "Toegang Controle lijst kan IP adres reeks toestaan of verbieden.";
-$text['title_description-access_controls']['pl-pl'] = "Lista kontroli dostępu może umożliwić lub zablokować zakresy adresów IP.";
-$text['title_description-access_controls']['pt-br'] = "Lista de controle de acesso pode permitir ou negar intervalos de endereços IP.";
-$text['title_description-access_controls']['pt-pt'] = "Lista de controle de acesso pode permitir ou negar intervalos de endereços IP.";
-$text['title_description-access_controls']['ro-ro'] = "Lista de control al accesului poate permite sau refuza intervale de adrese IP.";
-$text['title_description-access_controls']['ru-ru'] = "Контроль доступа может разрешить или запретить диапазоны IP адресов.";
-$text['title_description-access_controls']['sv-se'] = "Åtkomstkontrollista kan tillåta eller neka intervall av IP-adresser.";
-$text['title_description-access_controls']['uk-ua'] = "Список контролю доступу може дозволити або заборонити діапазони IP-адрес.";
-$text['title_description-access_controls']['tr-tr'] = "Erişim kontrol listesi IP adres aralıklarına izin verebilir veya reddedebilir.";
-$text['title_description-access_controls']['zh-cn'] = "访问控制列表可以允许或拒绝 IP 地址范围。";
-$text['title_description-access_controls']['ja-jp'] = "アクセス コントロール リストでは、IP アドレスの範囲を許可または拒否できます。";
-$text['title_description-access_controls']['ko-kr'] = "액세스 제어 목록은 IP 주소 범위를 허용하거나 거부할 수 있습니다.";
+$text['title-access_control_export']['en-us'] = "Access Control Export";
+$text['title-access_control_export']['en-gb'] = "Access Control Export";
+$text['title-access_control_export']['ar-eg'] = "";
+$text['title-access_control_export']['de-at'] = "";
+$text['title-access_control_export']['de-ch'] = "";
+$text['title-access_control_export']['de-de'] = "";
+$text['title-access_control_export']['ek-gr'] = "";
+$text['title-access_control_export']['es-cl'] = "";
+$text['title-access_control_export']['es-mx'] = "";
+$text['title-access_control_export']['fr-ca'] = "";
+$text['title-access_control_export']['fr-fr'] = "";
+$text['title-access_control_export']['he-il'] = "";
+$text['title-access_control_export']['it-it'] = "";
+$text['title-access_control_export']['ka-ge'] = "";
+$text['title-access_control_export']['nl-nl'] = "";
+$text['title-access_control_export']['pl-pl'] = "";
+$text['title-access_control_export']['pt-br'] = "";
+$text['title-access_control_export']['pt-pt'] = "";
+$text['title-access_control_export']['ro-ro'] = "";
+$text['title-access_control_export']['ru-ru'] = "";
+$text['title-access_control_export']['sv-se'] = "";
+$text['title-access_control_export']['uk-ua'] = "";
+$text['title-access_control_export']['tr-tr'] = "";
+$text['title-access_control_export']['zh-cn'] = "";
+$text['title-access_control_export']['ja-jp'] = "";
+$text['title-access_control_export']['ko-kr'] = "";
+
+$text['header-access_control_export']['en-us'] = "Access Control Export";
+$text['header-access_control_export']['en-gb'] = "Access Control Export";
+$text['header-access_control_export']['ar-eg'] = "";
+$text['header-access_control_export']['de-at'] = "";
+$text['header-access_control_export']['de-ch'] = "";
+$text['header-access_control_export']['de-de'] = "";
+$text['header-access_control_export']['ek-gr'] = "";
+$text['header-access_control_export']['es-cl'] = "";
+$text['header-access_control_export']['es-mx'] = "";
+$text['header-access_control_export']['fr-ca'] = "";
+$text['header-access_control_export']['fr-fr'] = "";
+$text['header-access_control_export']['he-il'] = "";
+$text['header-access_control_export']['it-it'] = "";
+$text['header-access_control_export']['ka-ge'] = "";
+$text['header-access_control_export']['nl-nl'] = "";
+$text['header-access_control_export']['pl-pl'] = "";
+$text['header-access_control_export']['pt-br'] = "";
+$text['header-access_control_export']['pt-pt'] = "";
+$text['header-access_control_export']['ro-ro'] = "";
+$text['header-access_control_export']['ru-ru'] = "";
+$text['header-access_control_export']['sv-se'] = "";
+$text['header-access_control_export']['uk-ua'] = "";
+$text['header-access_control_export']['tr-tr'] = "";
+$text['header-access_control_export']['zh-cn'] = "";
+$text['header-access_control_export']['ja-jp'] = "";
+$text['header-access_control_export']['ko-kr'] = "";
 
 $text['label-node_type']['en-us'] = "Type";
 $text['label-node_type']['en-gb'] = "Type";
@@ -405,6 +432,33 @@ $text['label-access_control_description']['zh-cn'] = "描述";
 $text['label-access_control_description']['ja-jp'] = "説明";
 $text['label-access_control_description']['ko-kr'] = "설명";
 
+$text['title_description-access_controls']['en-us'] = "Access control list can allow or deny ranges of IP addresses.";
+$text['title_description-access_controls']['en-gb'] = "Access control list can allow or deny ranges of IP addresses.";
+$text['title_description-access_controls']['ar-eg'] = "قائمة التحكم بالوصول يمكن السماح أو الرفض نطاقات العناوين.";
+$text['title_description-access_controls']['de-at'] = "Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen.";
+$text['title_description-access_controls']['de-ch'] = "Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen.";
+$text['title_description-access_controls']['de-de'] = "Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen.";
+$text['title_description-access_controls']['el-gr'] = "Access control list can allow or deny ranges of IP addresses";
+$text['title_description-access_controls']['es-cl'] = "Lista de control de acceso puede permitir o denegar los rangos de direcciones IP.";
+$text['title_description-access_controls']['es-mx'] = "Lista de control de acceso puede permitir o denegar los rangos de direcciones IP.";
+$text['title_description-access_controls']['fr-ca'] = "Liste de contrôle d'accès peut autoriser ou refuser des plages d'adresses IP.";
+$text['title_description-access_controls']['fr-fr'] = "Liste de contrôle d'accès peut autoriser ou refuser des plages d'adresses IP.";
+$text['title_description-access_controls']['he-il'] = " רשימת בקרת גישה יכולה לאפשר או למנוע טווחים של כתובות IP.";
+$text['title_description-access_controls']['it-it'] = "Le liste per il controllo di accesso permettono o negano l'accesso a range di IP.";
+$text['title_description-access_controls']['ka-ge'] = "წვდომის კონტროლის სიას IP მისამართების შუალედების დაშვება ან აკრძალვა შეუძლია";
+$text['title_description-access_controls']['nl-nl'] = "Toegang Controle lijst kan IP adres reeks toestaan of verbieden.";
+$text['title_description-access_controls']['pl-pl'] = "Lista kontroli dostępu może umożliwić lub zablokować zakresy adresów IP.";
+$text['title_description-access_controls']['pt-br'] = "Lista de controle de acesso pode permitir ou negar intervalos de endereços IP.";
+$text['title_description-access_controls']['pt-pt'] = "Lista de controle de acesso pode permitir ou negar intervalos de endereços IP.";
+$text['title_description-access_controls']['ro-ro'] = "Lista de control al accesului poate permite sau refuza intervale de adrese IP.";
+$text['title_description-access_controls']['ru-ru'] = "Контроль доступа может разрешить или запретить диапазоны IP адресов.";
+$text['title_description-access_controls']['sv-se'] = "Åtkomstkontrollista kan tillåta eller neka intervall av IP-adresser.";
+$text['title_description-access_controls']['uk-ua'] = "Список контролю доступу може дозволити або заборонити діапазони IP-адрес.";
+$text['title_description-access_controls']['tr-tr'] = "Erişim kontrol listesi IP adres aralıklarına izin verebilir veya reddedebilir.";
+$text['title_description-access_controls']['zh-cn'] = "访问控制列表可以允许或拒绝 IP 地址范围。";
+$text['title_description-access_controls']['ja-jp'] = "アクセス コントロール リストでは、IP アドレスの範囲を許可または拒否できます。";
+$text['title_description-access_controls']['ko-kr'] = "액세스 제어 목록은 IP 주소 범위를 허용하거나 거부할 수 있습니다.";
+
 $text['description-node_type']['en-us'] = "Select the type.";
 $text['description-node_type']['en-gb'] = "Select the type.";
 $text['description-node_type']['ar-eg'] = "حدد نوع.";
@@ -594,4 +648,31 @@ $text['description-access_control_default']['zh-cn'] = "选择默认类型。";
 $text['description-access_control_default']['ja-jp'] = "デフォルトのタイプを選択します。";
 $text['description-access_control_default']['ko-kr'] = "기본 유형을 선택합니다.";
 
+$text['description-access_control_export']['en-us'] = "Select the fields you wish to include in the export.";
+$text['description-access_control_export']['en-gb'] = "Select the fields you wish to include in the export.";
+$text['description-access_control_export']['ar-eg'] = "حدد الحقول التي ترغب في تضمينها في التصدير.";
+$text['description-access_control_export']['de-at'] = "Wählen Sie die Felder aus, die Sie in den Export einbeziehen möchten.";
+$text['description-access_control_export']['de-ch'] = "Wählen Sie die Felder aus, die Sie in den Export einbeziehen möchten.";
+$text['description-access_control_export']['de-de'] = "Wählen Sie die Felder aus, die Sie in den Export einbeziehen möchten.";
+$text['description-access_control_export']['ek-gr'] = "Επιλέξτε τα πεδία που θέλετε να συμπεριλάβετε στην εξαγωγή.";
+$text['description-access_control_export']['es-cl'] = "Seleccione los campos que desea incluir en la exportación.";
+$text['description-access_control_export']['es-mx'] = "Seleccione los campos que desea incluir en la exportación.";
+$text['description-access_control_export']['fr-ca'] = "Sélectionnez les champs que vous souhaitez inclure dans l'exportation.";
+$text['description-access_control_export']['fr-fr'] = "Sélectionnez les champs que vous souhaitez inclure dans l'exportation.";
+$text['description-access_control_export']['he-il'] = "בחר את השדות שברצונך לכלול בייצוא.";
+$text['description-access_control_export']['it-it'] = "Seleziona i campi che desideri includere nell'esportazione.";
+$text['description-access_control_export']['ka-ge'] = "აირჩიეთ ექსპორტში ჩასასმელი ველები.";
+$text['description-access_control_export']['nl-nl'] = "Selecteer de velden die u in de export wilt opnemen.";
+$text['description-access_control_export']['pl-pl'] = "Wybierz pola, które chcesz uwzględnić w eksporcie.";
+$text['description-access_control_export']['pt-br'] = "Selecione os campos que deseja incluir na exportação.";
+$text['description-access_control_export']['pt-pt'] = "Selecione os campos que deseja incluir na exportação.";
+$text['description-access_control_export']['ro-ro'] = "Selectați câmpurile pe care doriți să le includeți în export.";
+$text['description-access_control_export']['ru-ru'] = "Выберите поля, которые вы хотите включить в экспорт.";
+$text['description-access_control_export']['sv-se'] = "Välj de fält du vill inkludera i exporten.";
+$text['description-access_control_export']['uk-ua'] = "Виберіть поля, які потрібно включити в експорт.";
+$text['description-access_control_export']['tr-tr'] = "Dışa aktarmaya dahil etmek istediğiniz alanları seçin.";
+$text['description-access_control_export']['zh-cn'] = "选择您希望包含在导出中的字段。";
+$text['description-access_control_export']['ja-jp'] = "エクスポートに含めるフィールドを選択します。";
+$text['description-access_control_export']['ko-kr'] = "내보내기에 포함할 필드를 선택합니다.";
+
 ?>
diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php
index 567951aa52..e7680d1cd3 100644
--- a/app/calls_active/calls_active_inc.php
+++ b/app/calls_active/calls_active_inc.php
@@ -37,6 +37,21 @@
 		exit;
 	}
 
+//get the session settings
+	$domain_uuid = $_SESSION['domain_uuid'];
+	$domain_name = $_SESSION['domain_name'];
+	$user_uuid = $_SESSION['user_uuid'];
+	$gateways = $_SESSION['gateways'];
+	$user = $_SESSION['user'];
+
+//initialize the settings object
+	$settings = new settings(["domain_uuid" => $domain_uuid, "user_uuid" => $user_uuid]);
+
+//get the settings
+	$template_name = $settings->get('domain', 'template', 'default');
+	$theme_button_icon_back = $settings->get('theme', 'button_icon_back', '');
+	$theme_button_icon_all = $settings->get('theme', 'button_icon_all', '');
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -46,7 +61,7 @@
 	if ($show != "all") { $show = ''; }
 
 //include theme config for button images
-	include_once("themes/".$_SESSION['domain']['template']['name']."/config.php");
+	include_once("themes/".$template_name."/config.php");
 
 //set the command
 	$switch_cmd = 'show channels as json';
@@ -80,7 +95,7 @@
 				if (($show == 'all' && permission_exists('call_active_all'))) {
 					$rows[] = $row;
 				}
-				elseif ($row['domain_name'] == $_SESSION['domain_name']) {
+				elseif ($row['domain_name'] == $domain_name) {
 					$rows[] = $row;
 				}
 		}
@@ -131,20 +146,20 @@
 	echo "	<div class='heading'><b>".$text['title']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
 	echo "	<div class='actions'>\n";
 	echo "		<span id='refresh_state'>".button::create(['type'=>'button','title'=>$text['label-refresh_pause'],'icon'=>'sync-alt fa-spin','onclick'=>'refresh_stop()'])."</span>";
-	if (permission_exists('call_active_eavesdrop') && !empty($_SESSION['user']['extensions'])) {
-		if (sizeof($_SESSION['user']['extensions']) > 1) {
-			echo "	<input type='hidden' id='eavesdrop_dest' value=\"".(($_REQUEST['eavesdrop_dest'] == '') ? $_SESSION['user']['extension'][0]['destination'] : escape($_REQUEST['eavesdrop_dest']))."\">\n";
+	if (permission_exists('call_active_eavesdrop') && !empty($user['extensions'])) {
+		if (sizeof($user['extensions']) > 1) {
+			echo "	<input type='hidden' id='eavesdrop_dest' value=\"".(($_REQUEST['eavesdrop_dest'] == '') ? $user['extension'][0]['destination'] : escape($_REQUEST['eavesdrop_dest']))."\">\n";
 			echo "	<i class='fas fa-headphones' style='margin-left: 15px; cursor: help;' title='".$text['description-eavesdrop_destination']."' align='absmiddle'></i>\n";
 			echo "	<select class='formfld' style='margin-right: 5px;' align='absmiddle' onchange=\"document.getElementById('eavesdrop_dest').value = this.options[this.selectedIndex].value; refresh_start();\" onfocus='refresh_stop();'>\n";
-			if (is_array($_SESSION['user']['extensions'])) {
-				foreach ($_SESSION['user']['extensions'] as $user_extension) {
+			if (is_array($user['extensions'])) {
+				foreach ($user['extensions'] as $user_extension) {
 					echo "	<option value='".escape($user_extension)."' ".(($_REQUEST['eavesdrop_dest'] == $user_extension) ? "selected" : null).">".escape($user_extension)."</option>\n";
 				}
 			}
 			echo "	</select>\n";
 		}
-		else if (sizeof($_SESSION['user']['extensions']) == 1) {
-			echo "	<input type='hidden' id='eavesdrop_dest' value=\"".escape($_SESSION['user']['extension'][0]['destination'])."\">\n";
+		else if (sizeof($user['extensions']) == 1) {
+			echo "	<input type='hidden' id='eavesdrop_dest' value=\"".escape($user['extension'][0]['destination'])."\">\n";
 		}
 	}
 	if (permission_exists('call_active_hangup') && $rows) {
@@ -152,10 +167,10 @@
 	}
 	if (permission_exists('call_active_all')) {
 		if ($show == "all") {
-			echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'link'=>'calls_active.php','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+			echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$theme_button_icon_back,'link'=>'calls_active.php','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
 		}
 		else {
-			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'calls_active.php?show=all','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$theme_button_icon_all,'link'=>'calls_active.php?show=all','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
 		}
 	}
 	echo "	</div>\n";
@@ -224,20 +239,14 @@
 				$cid_num = str_replace("+", "", $cid_num);
 
 			//replace gateway uuid with name
-				if (is_array($_SESSION['gateways']) && sizeof($_SESSION['gateways']) > 0) {
-					foreach ($_SESSION['gateways'] as $gateway_uuid => $gateway_name) {
+				if (is_array($gateways) && sizeof($gateways) > 0) {
+					foreach ($gateways as $gateway_uuid => $gateway_name) {
 						$application_data = str_replace($gateway_uuid, $gateway_name, $application_data);
 					}
 				}
 
-			//convert $created to a UNIX timestamp
-				$created_timestamp = strtotime($created);
-
-			//get the current timestamp
-				$now = time();
-
 			//calculate elapsed seconds
-				$elapsed_seconds = $now - $created_timestamp;
+				$elapsed_seconds = time() - $created_epoch;
 
 			//convert seconds to hours, minutes, and seconds
 				$hours = floor($elapsed_seconds / 3600);
@@ -276,7 +285,7 @@
 				if (permission_exists('call_active_eavesdrop') || permission_exists('call_active_hangup')) {
 					echo "		<td class='button right' style='padding-right: 0;'>\n";
 					//eavesdrop
-					if (permission_exists('call_active_eavesdrop') && $callstate == 'ACTIVE' && !empty($_SESSION['user']['extensions']) && !in_array($cid_num, $_SESSION['user']['extensions'])) {
+					if (permission_exists('call_active_eavesdrop') && $callstate == 'ACTIVE' && !empty($user['extensions']) && !in_array($cid_num, $user['extensions'])) {
 						echo button::create(['type'=>'button','label'=>$text['label-eavesdrop'],'icon'=>'headphones','collapse'=>'hide-lg-dn','onclick'=>"if (confirm('".$text['confirm-eavesdrop']."')) { eavesdrop_call('".escape($cid_num)."','".escape($uuid)."'); } else { this.blur(); return false; }",'onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
 					}
 					//hangup
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 9b54b6535f..10f5035460 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -44,8 +44,9 @@
 	$device_firmware_version = '';
 	$device_template ='';
 
-//get the domain uuid
+//get the domain values
 	$domain_uuid = $_SESSION['domain_uuid'] ?? '';
+	$domain_name = $_SESSION['domain_name'] ?? '';
 
 //initialize the database object
 	$database = database::new();
@@ -64,12 +65,12 @@
 
 //get the total device count from the database, check the limit, if defined
 	if ($action == 'add') {
-		if (!empty($_SESSION['limit']['devices']['numeric']) && $_SESSION['limit']['devices']['numeric']) {
+		if (!empty($settings->get('limit', 'devices', ''))) {
 			$sql = "select count(*) from v_devices where domain_uuid = :domain_uuid ";
-			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$parameters['domain_uuid'] = $domain_uuid;
 			$total_devices = $database->select($sql, $parameters, 'column');
-			if ($total_devices >= $_SESSION['limit']['devices']['numeric']) {
-				message::add($text['message-maximum_devices'].' '.$_SESSION['limit']['devices']['numeric'], 'negative');
+			if ($total_devices >= $settings->get('limit', 'devices', '')) {
+				message::add($text['message-maximum_devices'].' '.$settings->get('limit', 'devices', ''), 'negative');
 				header('Location: devices.php');
 				exit;
 			}
@@ -228,14 +229,14 @@
 					$sql .= " and d1.device_uuid <> :device_uuid ";
 				}
 				$parameters['device_address'] = $device_address;
-				$domain_name = $database->select($sql, $parameters, 'column');
-				if ($domain_name != '') {
-					$message = $text['message-duplicate'].(if_group("superadmin") && $_SESSION["domain_name"] != $domain_name ? ": ".$domain_name : null);
+				$device_domain_name = $database->select($sql, $parameters, 'column');
+				if ($device_domain_name != '') {
+					$message = $text['message-duplicate'].($device_domain_name != $domain_name ? ": ".$device_domain_name : null);
 					message::add($message,'negative');
 					header('Location: devices.php');
 					exit;
 				}
-				unset($sql, $parameters, $domain_name);
+				unset($sql, $parameters, $device_domain_name);
 			}
 
 		//add or update the database
@@ -304,6 +305,7 @@
 									$device_line_uuid = uuid();
 									$new_line = true;
 								}
+
 								$array['devices'][0]['device_lines'][$y]['domain_uuid'] = $domain_uuid;
 								$array['devices'][0]['device_lines'][$y]['device_uuid'] = $device_uuid;
 								$array['devices'][0]['device_lines'][$y]['device_line_uuid'] = $device_line_uuid;
@@ -311,23 +313,23 @@
 								$array['devices'][0]['device_lines'][$y]['server_address'] = $row["server_address"];
 								if (permission_exists('device_line_outbound_proxy_primary')) {
 									$array['devices'][0]['device_lines'][$y]['outbound_proxy_primary'] = $row["outbound_proxy_primary"];
-								} else if ($new_line && isset($_SESSION['provision']['outbound_proxy_primary'])) {
-									$array['devices'][0]['device_lines'][$y]['outbound_proxy_primary'] = $_SESSION['provision']['outbound_proxy_primary']['text'];
+								} else if ($new_line && !empty($settings->get('provision', 'outbound_proxy_primary'))) {
+									$array['devices'][0]['device_lines'][$y]['outbound_proxy_primary'] = $settings->get('provision', 'outbound_proxy_primary', '');
 								}
 								if (permission_exists('device_line_outbound_proxy_secondary')) {
 									$array['devices'][0]['device_lines'][$y]['outbound_proxy_secondary'] = $row["outbound_proxy_secondary"];
-								} else if ($new_line && isset($_SESSION['provision']['outbound_proxy_secondary'])) {
-									$array['devices'][0]['device_lines'][$y]['outbound_proxy_secondary'] = $_SESSION['provision']['outbound_proxy_secondary']['text'];
+								} else if ($new_line && !empty($settings->get('provision', 'outbound_proxy_secondary'))) {
+									$array['devices'][0]['device_lines'][$y]['outbound_proxy_secondary'] = $settings->get('provision', 'outbound_proxy_secondary', '');
 								}
 								if (permission_exists('device_line_server_address_primary')) {
 									$array['devices'][0]['device_lines'][$y]['server_address_primary'] = $row["server_address_primary"];
-								} else if ($new_line && isset($_SESSION['provision']['server_address_primary'])) {
-									$array['devices'][0]['device_lines'][$y]['server_address_primary'] = $_SESSION['provision']['server_address_primary']['text'];
+								} else if ($new_line && !empty($settings->get('provision', 'server_address_primary'))) {
+									$array['devices'][0]['device_lines'][$y]['server_address_primary'] = $settings->get('provision', 'server_address_primary', '');
 								}
 								if (permission_exists('device_line_server_address_secondary')) {
 									$array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $row["server_address_secondary"];
-								} else if ($new_line && isset($_SESSION['provision']['server_address_secondary'])) {
-									$array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $_SESSION['provision']['server_address_secondary']['text'];
+								} else if ($new_line && !empty($settings->get('provision', 'server_address_secondary'))) {
+									$array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $settings->get('provision', 'server_address_secondary', '');
 								}
 								if (permission_exists('device_line_label')) {
 									$array['devices'][0]['device_lines'][$y]['label'] = $row["label"];
@@ -351,7 +353,7 @@
 								}
 								else {
 									if ($action == "add") {
-										$array['devices'][0]['device_lines'][$y]['sip_port'] = $_SESSION['provision']['line_sip_port']['numeric'];
+										$array['devices'][0]['device_lines'][$y]['sip_port'] = $settings->get('provision', 'line_sip_port', '5060');
 									}
 								}
 								if (permission_exists('device_line_transport')) {
@@ -359,7 +361,7 @@
 								}
 								else {
 									if ($action == "add") {
-										$array['devices'][0]['device_lines'][$y]['sip_transport'] = $_SESSION['provision']['line_sip_transport']['text'];
+										$array['devices'][0]['device_lines'][$y]['sip_transport'] = $settings->get('provision', 'line_sip_transport', 'tcp');
 									}
 								}
 								if (permission_exists('device_line_register_expires')) {
@@ -367,7 +369,7 @@
 								}
 								else {
 									if ($action == "add") {
-										$array['devices'][0]['device_lines'][$y]['register_expires'] = $_SESSION['provision']['line_register_expires']['numeric'];
+										$array['devices'][0]['device_lines'][$y]['register_expires'] = $settings->get('provision', 'line_register_expires', '120');
 									}
 								}
 								$y++;
@@ -480,7 +482,7 @@
 					}
 
 				//write the provision files
-					if (!empty($_SESSION['provision']['path']['text'])) {
+					if (!empty($settings->get('provision', 'path'))) {
 						$prov = new provision(['settings' => $settings]);
 						$prov->domain_uuid = $domain_uuid;
 						$response = $prov->write();
@@ -509,7 +511,6 @@
 		$sql = "select * from v_devices ";
 		$sql .= "where device_uuid = :device_uuid ";
 		$parameters['device_uuid'] = $device_uuid;
-
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$device_address = $row["device_address"];
@@ -533,6 +534,13 @@
 		unset($sql, $parameters, $row);
 	}
 
+//get device lines
+	$sql = "select * ";
+	$sql .= "from v_domains ";
+	$sql .= "order by domain_name asc ";
+	$domains = $database->select($sql, null, 'all');
+	unset($sql, $parameters);
+
 //set the defaults
 	if (empty($device_enabled)) { $device_enabled = 'true'; }
 
@@ -563,20 +571,22 @@
 	}
 
 //get device lines
-	$sql = "select * from v_device_lines ";
+	$sql = "select l.*, d.domain_name ";
+	$sql .= "from v_device_lines as l, v_domains as d ";
 	$sql .= "where device_uuid = :device_uuid ";
+	$sql .= "and l.domain_uuid = d.domain_uuid ";
 	$sql .= "order by cast(line_number as int) asc ";
 	$parameters['device_uuid'] = $device_uuid ?? null;
-
 	$device_lines = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
+//set the new line defaults
 	$device_lines[$x]['line_number'] = '';
 	$device_lines[$x]['server_address'] = '';
-	$device_lines[$x]['outbound_proxy_primary'] = $_SESSION['provision']['outbound_proxy_primary']['text'] ?? null;
-	$device_lines[$x]['outbound_proxy_secondary'] = $_SESSION['provision']['outbound_proxy_secondary']['text'] ?? null;
-	$device_lines[$x]['server_address_primary'] = $_SESSION['provision']['server_address_primary']['text'] ?? null;
-	$device_lines[$x]['server_address_secondary'] = $_SESSION['provision']['server_address_secondary']['text'] ?? null;
+	$device_lines[$x]['outbound_proxy_primary'] = $settings->get('provision', 'outbound_proxy_primary', null);
+	$device_lines[$x]['outbound_proxy_secondary'] = $settings->get('provision', 'outbound_proxy_secondary', null);
+	$device_lines[$x]['server_address_primary'] = $settings->get('provision', 'server_address_primary', null);
+	$device_lines[$x]['server_address_secondary'] = $settings->get('provision', 'server_address_secondary', null);
 	$device_lines[$x]['label'] = '';
 	$device_lines[$x]['display_name'] = '';
 	$device_lines[$x]['user_id'] = '';
@@ -584,9 +594,9 @@
 	$device_lines[$x]['password'] = '';
 	$device_lines[$x]['shared_line'] = '';
 	$device_lines[$x]['enabled'] = '';
-	$device_lines[$x]['sip_port'] = $_SESSION['provision']['line_sip_port']['numeric'];
-	$device_lines[$x]['sip_transport'] = $_SESSION['provision']['line_sip_transport']['text'];
-	$device_lines[$x]['register_expires'] = $_SESSION['provision']['line_register_expires']['numeric'];
+	$device_lines[$x]['sip_port'] = $settings->get('provision', 'line_sip_port', '5060');
+	$device_lines[$x]['sip_transport'] = $settings->get('provision', 'line_sip_transport', 'tcp');
+	$device_lines[$x]['register_expires'] = $settings->get('provision', 'line_register_expires', '120');
 
 //get device keys
 	$sql = "select * from v_device_keys ";
@@ -612,11 +622,11 @@
 
 //add empty device key row(s)
 	if (!is_uuid($device_uuid)) {
-		$rows = $_SESSION['devices']['key_add_rows']['numeric'] ?? 1;
+		$rows = $settings->get('devices', 'key_add_rows', '10');
 		$id = 0;
 	}
 	else {
-		$rows = $_SESSION['devices']['key_edit_rows']['numeric'] ?? 1;
+		$rows = $settings->get('devices', 'key_edit_rows', '3');
 		$id = count($device_keys) + 1;
 	}
 	for ($x = 0; $x < $rows; $x++) {
@@ -638,7 +648,6 @@
 	$sql .= "from v_device_vendors ";
 	$sql .= "where enabled = 'true' ";
 	$sql .= "order by name asc ";
-
 	$device_vendors = $database->select($sql, null, 'all');
 	unset($sql);
 
@@ -662,11 +671,11 @@
 
 //add empty device setting row(s)
 	if (!is_uuid($device_uuid)) {
-		$rows = $_SESSION['devices']['setting_add_rows']['numeric'] ?? 1;
+		$rows = $settings->get('devices', 'key_add_rows', '10');
 		$id = 0;
 	}
 	else {
-		$rows = $_SESSION['devices']['setting_edit_rows']['numeric'] ?? 1;
+		$rows = $settings->get('devices', 'key_edit_rows', '3');
 		$id = count($device_settings) + 1;
 	}
 	for ($x = 0; $x < $rows; $x++) {
@@ -694,12 +703,7 @@
 
 //get the first device line info (found on the local server) for the provision button
 	foreach ($device_lines as $row) {
-		if (
-			array_key_exists($row['domain_uuid'], $_SESSION['domains']) &&
-			$row['server_address'] == $_SESSION['domains'][$row['domain_uuid']]['domain_name'] &&
-			!empty($row['user_id']) &&
-			!empty($row['server_address'])
-			) {
+		if ($row['server_address'] == $row['domain_name'] && !empty($row['user_id']) && !empty($row['server_address'])) {
 			$user_id = $row['user_id'];
 			$server_address = $row['server_address'];
 			break;
@@ -731,14 +735,13 @@
 		echo "		$('#target_file').fadeOut(fade_speed);\n";
 		echo "		document.getElementById('target_file').selectedIndex = 0;\n";
 		echo "	}\n";
-
 		echo "	function download(d) {\n";
 		echo "		if (d == '".$text['label-download']."') return;\n";
-		if ($_SESSION['provision']['http_domain_filter']['boolean'] == "false") {
-			$domain_name = $_SERVER["HTTP_HOST"];
+		if ($settings->get('provision', 'http_domain_filter', true)) {
+			$provision_domain_name = $domain_name;
 		}
 		else {
-			$domain_name = $_SESSION['domain_name'];
+			$provision_domain_name = $_SERVER["HTTP_HOST"];
 		}
 
 		if (!isset($_SERVER['HTTP_PROTOCOL'])) {
@@ -747,7 +750,7 @@
 			if ($_SERVER['HTTPS'] == 'on') { $_SERVER['HTTP_PROTOCOL'] = 'https'; }
 			if ($_SERVER['SERVER_PORT'] == '443') { $_SERVER['HTTP_PROTOCOL'] = 'https'; }
 		}
-		echo "		window.location = '".$_SERVER['HTTP_PROTOCOL']."://".$domain_name.PROJECT_PATH."/app/provision/index.php?address=".escape($device_address ?? '')."&file=' + d + '&content_type=application/octet-stream';\n";
+		echo "		window.location = '".$_SERVER['HTTP_PROTOCOL']."://".$provision_domain_name.PROJECT_PATH."/app/provision/index.php?address=".escape($device_address ?? '')."&file=' + d + '&content_type=application/octet-stream';\n";
 		echo "	}\n";
 
 		echo "\n";
@@ -793,16 +796,11 @@
 //add the QR code
 	if (permission_exists("device_line_password") && !empty($device_template) && $qr_code_enabled) {
 		//set the mode
-		if (isset($_SESSION['theme']['qr_image'])) {
-			if (!empty($_SESSION['theme']['qr_image'])) {
-				$mode = '4';
-			}
-			else {
-				$mode = '0';
-			}
+		if (!empty($settings->get('theme', 'qr_image', ''))) {
+			$mode = '4';
 		}
 		else {
-			$mode = '4';
+			$mode = '0';
 		}
 
 		//get the device line settings
@@ -922,15 +920,10 @@
 		//build content for linphone
 		if ($device_template == "linphone/default") {
 			$auth_string = '';
-			if (
-				!empty($_SESSION['provision']['http_auth_enabled']['boolean']) &&
-				$_SESSION['provision']['http_auth_enabled']['boolean'] == 'true' &&
-				!empty($_SESSION['provision']['http_auth_username']['text']) &&
-				!empty($_SESSION['provision']['http_auth_password'][0])
-				) {
-				$auth_string = $_SESSION['provision']['http_auth_username']['text'].':'.$_SESSION['provision']['http_auth_password'][0].'@';
+			if ($settings->get('provision', 'http_auth_enabled', true) && !empty($settings->get('provision', 'http_auth_username', '')) && !empty($settings->get('provision', 'http_auth_password', ''))) {
+				$auth_string = $settings->get('provision', 'http_auth_username', '').':'.$settings->get('provision', 'http_auth_password', '').'@';
 			}
-			$content = "https://".$auth_string.$_SESSION['domain_name'].'/app/provision/index.php?address='.$device_address;
+			$content = "https://".$auth_string.$provision_domain_name.'/app/provision/index.php?address='.$device_address;
 		}
 
 		//stream the file
@@ -1001,16 +994,16 @@
 			echo "	<img id='qr_code' src='data:image/jpeg;base64,".base64_encode($image)."'>\n";
 			echo "</div>\n";
 		}
+
 		/*
-		if (isset($_SESSION['theme']['qr_image'])) {
-			echo "<img id='img-buffer' src='".$_SESSION["theme"]["qr_image"]["text"]."' style='display: none;'>";
+		if (!empty($settings->get('theme', 'qr_image', ''))) {
+			echo "<img id='img-buffer' src='".$settings->get('theme', 'qr_image', '')."' style='display: none;'>";
 		}
 		else {
-			echo "<img id='img-buffer' src='".PROJECT_PATH."/themes/".$_SESSION["domain"]["template"]["name"]."/images/qr_code.png' style='display: none;'>";
+			echo "<img id='img-buffer' src='".PROJECT_PATH."/themes/".$settings->get('domain', 'template', '')."/images/qr_code.png' style='display: none;'>";
 		}
 		*/
 
-
 	}
 
 //show the content
@@ -1020,7 +1013,7 @@
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-device']."</b></div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'devices.php']);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back', ''),'id'=>'btn_back','link'=>'devices.php']);
 	if ($action == 'update') {
 		$button_margin = 'margin-left: 15px;';
 		if (permission_exists("device_line_password") && $qr_code_enabled) {
@@ -1038,7 +1031,7 @@
 				$template_dir = $prov->template_dir;
 				$files = glob($template_dir.'/'.$device_template.'/*');
 			//add file buttons and the file list
-				echo button::create(['type'=>'button','id'=>'button_files','label'=>$text['button-files'],'icon'=>$_SESSION['theme']['button_icon_download'],'style'=>($button_margin ?? ''),'onclick'=>'show_files()']);
+				echo button::create(['type'=>'button','id'=>'button_files','label'=>$text['button-files'],'icon'=>$settings->get('theme', 'button_icon_download', ''),'style'=>($button_margin ?? ''),'onclick'=>'show_files()']);
 				echo 		"<select class='formfld' style='display: none; width: auto;' name='target_file' id='target_file' onchange='download(this.value)'>\n";
 				echo "			<option value=''>".$text['label-download']."</option>\n";
 				foreach ($files as $file) {
@@ -1054,7 +1047,7 @@
 				unset($button_margin);
 		}
 		if (permission_exists('device_add')) {
-			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'style'=>($button_margin ?? ''),'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','new_address');"]);
+			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$settings->get('theme', 'button_icon_copy', ''),'style'=>($button_margin ?? ''),'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','new_address');"]);
 			unset($button_margin);
 		}
 		if (
@@ -1063,11 +1056,11 @@
 			permission_exists('device_key_delete') ||
 			permission_exists('device_setting_delete')
 			) {
-			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'style'=>($button_margin ?? ''),'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete', ''),'style'=>($button_margin ?? ''),'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 			unset($button_margin);
 		}
 	}
-	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>'margin-left: 15px;','onclick'=>'submit_form();']);
+	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$settings->get('theme', 'button_icon_save', ''),'id'=>'btn_save','style'=>'margin-left: 15px;','onclick'=>'submit_form();']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
@@ -1289,11 +1282,11 @@
 
 			//set the defaults
 				if (!permission_exists('device_line_server_address')) {
-					if (empty($row['server_address'])) { $row['server_address'] = $_SESSION['domain_name']; }
+					if (empty($row['server_address'])) { $row['server_address'] = $domain_name; }
 				}
-				if (empty($row['sip_transport'])) { $row['sip_transport'] = $_SESSION['provision']['line_sip_transport']['text']; }
-				if (!isset($row['sip_port'])) { $row['sip_port'] = $_SESSION['provision']['line_sip_port']['numeric']; } //used !isset to support a value of 0 as empty the empty function considers a value of 0 as empty.
-				if (empty($row['register_expires'])) { $row['register_expires'] = $_SESSION['provision']['line_register_expires']['numeric']; }
+				if (empty($row['sip_transport'])) { $row['sip_transport'] = $settings->get('provision', 'line_sip_transport', 'tcp'); }
+				if (!isset($row['sip_port'])) { $row['sip_port'] = $settings->get('provision', 'line_sip_port', '5060'); } //used !isset to support a value of 0 as empty the empty function considers a value of 0 as empty.
+				if (empty($row['register_expires'])) { $row['register_expires'] = $settings->get('provision', 'line_register_expires', '120'); }
 
 			//add the primary key uuid
 				if (!empty($row['device_line_uuid']) && is_uuid($row['device_line_uuid'])) {
@@ -1323,10 +1316,10 @@
 
 				if (permission_exists('device_line_server_address_primary')) {
 					echo "			<td valign='top' align='left' nowrap='nowrap'>\n";
-					if (isset($_SESSION['provision']['server_address_primary']) && !isset($_SESSION['provision']['server_address_primary']['text'])) {
+					if (!empty($settings->get('provision', 'server_address_primary', '')) && is_array($settings->get('provision', 'server_address_primary', ''))) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][server_address_primary]'>\n";
 						echo "					<option value=''></option>\n";
-						foreach($_SESSION['provision']['server_address_primary'] as $field) {
+						foreach($settings->get('provision', 'server_address_primary', '') as $field) {
 							echo "					<option value='".$field."' ".(($row['server_address_primary'] == $field) ? "selected" : null).">".$field."</option>\n";
 						}
 						echo "				</select>\n";
@@ -1339,10 +1332,10 @@
 
 				if (permission_exists('device_line_server_address_secondary')) {
 					echo "			<td valign='top' align='left' nowrap='nowrap'>\n";
-					if (isset($_SESSION['provision']['server_address_secondary']) && !isset($_SESSION['provision']['server_address_secondary']['text'])) {
+					if (!empty($settings->get('provision', 'server_address_secondary', '')) && is_array($settings->get('provision', 'server_address_secondary', ''))) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][server_address_secondary]'>\n";
 						echo "					<option value=''></option>\n";
-						foreach($_SESSION['provision']['server_address_secondary'] as $field) {
+						foreach($settings->get('provision', 'server_address_secondary', '') as $field) {
 							echo "					<option value='".$field."' ".(($row['server_address_secondary'] == $field) ? "selected" : null).">".$field."</option>\n";
 						}
 						echo "				</select>\n";
@@ -1355,10 +1348,10 @@
 
 				if (permission_exists('device_line_outbound_proxy_primary')) {
 					echo "			<td align='left'>\n";
-					if (isset($_SESSION['provision']['outbound_proxy_primary']) && !isset($_SESSION['provision']['outbound_proxy_primary']['text'])) {
+					if (!empty($settings->get('provision', 'outbound_proxy_primary', ''))) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][outbound_proxy_primary]'>\n";
 						echo "					<option value=''></option>\n";
-						foreach($_SESSION['provision']['outbound_proxy_primary'] as $field) {
+						foreach($settings->get('provision', 'outbound_proxy_primary', '') as $field) {
 							echo "					<option value='".$field."' ".(($row['outbound_proxy_primary'] == $field) ? "selected" : null).">".$field."</option>\n";
 						}
 						echo "				</select>\n";
@@ -1371,10 +1364,10 @@
 
 				if (permission_exists('device_line_outbound_proxy_secondary')) {
 					echo "			<td align='left'>\n";
-					if (isset($_SESSION['provision']['outbound_proxy_secondary']) && !isset($_SESSION['provision']['outbound_proxy_secondary']['text'])) {
+					if (!empty($settings->get('provision', 'outbound_proxy_secondary', ''))) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][outbound_proxy_secondary]'>\n";
 						echo "					<option value=''></option>\n";
-						foreach($_SESSION['provision']['outbound_proxy_secondary'] as $field) {
+						foreach($settings->get('provision', 'outbound_proxy_secondary', '') as $field) {
 							echo "					<option value='".$field."' ".(($row['outbound_proxy_secondary'] == $field) ? "selected" : null).">".$field."</option>\n";
 						}
 						echo "				</select>\n";
@@ -1495,7 +1488,7 @@
 				foreach($device_profiles as $row) {
 					echo "			<option value='".escape($row['device_profile_uuid'])."' ".(!empty($device_profile_uuid) && $row['device_profile_uuid'] == $device_profile_uuid ? "selected='selected'" : null).">".escape($row['device_profile_name'])." ".(($row['domain_uuid'] == '') ? "&nbsp;&nbsp;(".$text['select-global'].")" : null)."</option>\n";
 				}
-				echo "                  </select>\n";
+				echo "			</select>\n";
 			}
 			else {
 				foreach($device_profiles as $row) {
@@ -1963,7 +1956,7 @@
 		else {
 			echo "  <option value=''>".$text['select-global']."</option>\n";
 		}
-		foreach ($_SESSION['domains'] as $row) {
+		foreach ($domains as $row) {
 			if ($row['domain_uuid'] == $domain_uuid) {
 				echo "  <option value='".escape($row['domain_uuid'])."' selected='selected'>".escape($row['domain_name'])."</option>\n";
 			}
@@ -1978,7 +1971,7 @@
 		echo "</tr>\n";
 	}
 	else {
-		echo "	<input type='hidden' name='domain_uuid' id='domain_uuid' value=\"".$_SESSION['domain_uuid']."\"/>\n";
+		echo "	<input type='hidden' name='domain_uuid' id='domain_uuid' value=\"".$domain_uuid."\"/>\n";
 	}
 
 	if (permission_exists('device_enable')) {
@@ -1987,7 +1980,7 @@
 		echo "	".$text['label-device_enabled']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+		if (substr($settings->get('theme', 'input_toggle_style', ''), 0, 6) == 'switch') {
 			echo "	<label class='switch'>\n";
 			echo "		<input type='checkbox' id='device_enabled' name='device_enabled' value='true' ".($device_enabled == 'true' ? "checked='checked'" : null).">\n";
 			echo "		<span class='slider'></span>\n";
diff --git a/app/dialplans/resources/switch/conf/dialplan/480_operator.xml b/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
index 77cc9b8faa..cc8cac8650 100644
--- a/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
@@ -1,9 +1,9 @@
 <extension name="operator" number="0" context="${domain_name}" continue="false" app_uuid="0e1cd2d7-9d84-4959-8b6c-0cb23de4de59" enabled="false" order="480">
 	<condition field="destination_number" expression="^0$|^operator$">
-		<action application="export" data="transfer_context={v_context}" enabled="true"/>
-		<action application="bind_meta_app" data="4 ab s execute_extension::att_xfer XML ${context}" enabled="false"/>
-		<action application="bind_meta_app" data="5 ab s execute_extension::xfer_vm XML ${context}" enabled="false"/>
-		<action application="set" data="domain_name={v_context}" enabled="true"/>
-		<action application="transfer" data="${operator} XML {v_context}" enabled="true"/>
+		<action application="export" data="transfer_context=${domain_name}" enabled="true"/>
+		<action application="bind_meta_app" data="4 ab s execute_extension::att_xfer XML ${domain_name}" enabled="false"/>
+		<action application="bind_meta_app" data="5 ab s execute_extension::xfer_vm XML ${domain_name}" enabled="false"/>
+		<action application="set" data="domain_name=${domain_name}" enabled="true"/>
+		<action application="transfer" data="${operator} XML ${domain_name}" enabled="true"/>
 	</condition>
 </extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml b/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml
index 26aa9dbad8..7eeecdadf8 100644
--- a/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml
@@ -1,6 +1,6 @@
 <extension name="operator-forward" number="*000" context="${domain_name}" continue="false" app_uuid="a90d3639-3b82-4905-a65d-85f58b6c4a19" enabled="true" order="485">
 	<condition field="destination_number" expression="^\*000$" >
-		<action application="set" data="dial_string=loopback/operator/${context}/XML" />
+		<action application="set" data="dial_string=loopback/operator/${domain_name}/XML" />
 		<action application="set" data="direction=both" />
 		<action application="set" data="extension=true" />
 		<action application="lua" data="dial_string.lua" />
diff --git a/app/email_queue/resources/service/email_queue.php b/app/email_queue/resources/service/email_queue.php
index 06f2c3d6c0..f12a023502 100644
--- a/app/email_queue/resources/service/email_queue.php
+++ b/app/email_queue/resources/service/email_queue.php
@@ -141,7 +141,7 @@
 		$sql = "select * from v_email_queue ";
 		$sql .= "where (email_status = 'waiting' or email_status = 'trying') ";
 		$sql .= "and hostname = :hostname ";
-		$sql .= "order by domain_uuid asc ";
+		$sql .= "order by domain_uuid, email_date desc ";
 		$sql .= "limit :limit ";
 		$parameters['hostname'] = $hostname;
 		$parameters['limit'] = $email_queue_limit;
diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php
index b48a9e0674..61c7dff3d7 100644
--- a/app/fax_queue/resources/job/fax_send.php
+++ b/app/fax_queue/resources/job/fax_send.php
@@ -291,7 +291,9 @@
 			$sql .= ")";
 			$parameters['destination_number'] = $fax_number;
 			$destination_count = $database->select($sql, $parameters, 'column');
+			$local_destination = false;
 			if ($destination_count > 0) {
+				$local_destination = true;
 				$route_array[] = 'loopback/'.$fax_number.'/public';
 			}
 
@@ -307,6 +309,12 @@
 			$common_variables .= "fax_header='"                  . escape_quote($fax_caller_id_name) . "',";
 			$common_variables .= "fax_file='"                    . escape_quote($fax_file) . "',";
 
+		//add the fax destination number variables
+			if ($local_destination) {
+				$common_variables .= "sip_to_user=".$fax_number.",";
+				$common_variables .= "sip_req_user=".$fax_number.",";
+			}
+
 		//prepare the fax command
 			if (empty($route_array)) {
 				$route_array = outbound_route_to_bridge($domain_uuid, $fax_prefix . $fax_number, $channel_variables);
diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php
index 68b076b4c2..80f658a42f 100644
--- a/app/ivr_menus/ivr_menu_edit.php
+++ b/app/ivr_menus/ivr_menu_edit.php
@@ -873,6 +873,16 @@
 						unset($selected);
 					}
 				}
+				else if ($key == 'phrases') {
+					if (!empty($instance_value) && $instance_value == $row["value"]) {
+						$selected = "selected='selected'";
+						$playable = '';
+						$found = true;
+					}
+					else {
+						unset($selected);
+					}
+				}
 				else {
 					unset($selected);
 				}
@@ -946,6 +956,16 @@
 						unset($selected);
 					}
 				}
+				else if ($key == 'phrases') {
+					if (!empty($instance_value) && $instance_value == $row["value"]) {
+						$selected = "selected='selected'";
+						$playable = '';
+						$found = true;
+					}
+					else {
+						unset($selected);
+					}
+				}
 				else {
 					unset($selected);
 				}
diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php
index 601f0f68dc..2ca3b01911 100644
--- a/app/log_viewer/log_viewer.php
+++ b/app/log_viewer/log_viewer.php
@@ -152,9 +152,9 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
+	echo "<table width='100%' style='table-layout: fixed;' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td style='background-color: #1c1c1c; padding: 8px; text-align: left;'>";
+	echo "		<td style='background-color: #1c1c1c; padding: 8px; text-align: left; overflow-wrap: break-word;'>";
 
 	if (permission_exists('log_view')) {
 
@@ -348,4 +348,4 @@
 		fclose($file);
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 3e73034d64..b429120270 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -40,9 +40,33 @@
 //initialize the database connection
 	$database = database::new();
 
-//add the settings object
-	$settings = new settings(["domain_uuid" => $_SESSION['domain_uuid'], "user_uuid" => $_SESSION['user_uuid']]);
-	$speech_enabled = $settings->get('speech', 'enabled');
+//get the session settings
+	$domain_uuid = $_SESSION['domain_uuid'];
+	$domain_name = $_SESSION['domain_name'];
+	$user_uuid = $_SESSION['user_uuid'];
+	$domains =  $_SESSION['domains'];
+
+//initialize the settings object
+	$settings = new settings(["domain_uuid" => $domain_uuid, "user_uuid" => $user_uuid]);
+
+//get the settings
+	$switch_recordings = $settings->get('switch', 'recordings');
+	$time_zone = $settings->get('domain', 'time_zone', date_default_timezone_get());
+	$speech_enabled = $settings->get('speech', 'enabled', false);
+	$recording_storage_type = $settings->get('recordings','storage_type');
+	$recording_password = $settings->get('recordings','recording_password');
+	$domain_paging = $settings->get('domain','paging', 100);
+	$theme_button_icon_edit = $settings->get('theme','button_icon_edit');
+	$theme_button_icon_add = $settings->get('theme','button_icon_add');
+	$theme_button_icon_upload = $settings->get('theme','button_icon_upload');
+	$theme_button_icon_cancel = $settings->get('theme','button_icon_cancel');
+	$theme_button_icon_delete = $settings->get('theme','button_icon_delete');
+	$theme_button_icon_all = $settings->get('theme','button_icon_all');
+	$theme_button_icon_search = $settings->get('theme','button_icon_search');
+	$theme_list_row_edit_button = $settings->get('theme','list_row_edit_button');
+	$theme_button_icon_download = $settings->get('theme','button_icon_download');
+	$theme_button_icon_play = $settings->get('theme','button_icon_play');
+	$theme_button_icon_reset = $settings->get('theme','button_icon_reset');
 
 //set additional variables
 	$action = $_REQUEST["action"] ?? '';
@@ -53,7 +77,7 @@
 	if ($action == "download" && (permission_exists('recording_play') || permission_exists('recording_download'))) {
 		if ($_GET['type'] == "rec") {
 			//set the path for the directory
-				$path = $_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name'];
+				$path = $switch_recordings."/".$domain_name;
 
 			//if from recordings, get recording details from db
 				$recording_uuid = $_GET['id']; //recordings
@@ -67,7 +91,7 @@
 					$row = $database->select($sql, $parameters, 'row');
 					if (is_array($row) && @sizeof($row) != 0) {
 						$recording_filename = $row['recording_filename'];
-						if (!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] == 'base64' && !empty($row['recording_base64'])) {
+						if ($recording_storage_type == 'base64') {
 							$recording_decoded = base64_decode($row['recording_base64']);
 							file_put_contents($path.'/'.$recording_filename, $recording_decoded);
 						}
@@ -130,12 +154,12 @@
 			$recording_filename = str_replace("'", "", $recording_filename);
 
 		//make sure the destination directory exists
-			if (!is_dir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'])) {
-				mkdir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'], 0770, false);
+			if (!is_dir($switch_recordings.'/'.$domain_name)) {
+				mkdir($switch_recordings.'/'.$domain_name, 0770, false);
 			}
 
 		//move the uploaded files
-			$result = move_uploaded_file($_FILES['file']['tmp_name'], $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$recording_filename);
+			$result = move_uploaded_file($_FILES['file']['tmp_name'], $switch_recordings.'/'.$domain_name.'/'.$recording_filename);
 
 		//clear the destinations session array
 			if (isset($_SESSION['destinations']['array'])) {
@@ -171,10 +195,10 @@
 			$array_recordings[$row['recording_uuid']] = $row['recording_filename'];
 			$array_base64_exists[$row['recording_uuid']] = ($row['recording_base64'] != '') ? true : false;
 			//if not base64, convert back to local files and remove base64 from db
-			if (!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] != 'base64' && $row['recording_base64'] != '') {
-				if (!file_exists($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$row['recording_filename'])) {
+			if ($recording_storage_type != 'base64' && $row['recording_base64'] != '') {
+				if (!file_exists($switch_recordings.'/'.$domain_name.'/'.$row['recording_filename'])) {
 					$recording_decoded = base64_decode($row['recording_base64']);
-					file_put_contents($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$row['recording_filename'], $recording_decoded);
+					file_put_contents($switch_recordings.'/'.$domain_name.'/'.$row['recording_filename'], $recording_decoded);
 					//build array
 						$array['recordings'][0]['recording_uuid'] = $row['recording_uuid'];
 						$array['recordings'][0]['domain_uuid'] = $domain_uuid;
@@ -196,10 +220,10 @@
 	unset($sql, $parameters, $result, $row);
 
 //add recordings to the database
-	if (is_dir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/')) {
-		if ($dh = opendir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/')) {
+	if (is_dir($switch_recordings.'/'.$domain_name.'/')) {
+		if ($dh = opendir($switch_recordings.'/'.$domain_name.'/')) {
 			while (($recording_filename = readdir($dh)) !== false) {
-				if (filetype($_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/".$recording_filename) == "file") {
+				if (filetype($switch_recordings."/".$domain_name."/".$recording_filename) == "file") {
 
 					if (!is_array($array_recordings) || !in_array($recording_filename, $array_recordings)) {
 						//file not found in db, add it
@@ -212,8 +236,8 @@
 							$array['recordings'][0]['recording_filename'] = $recording_filename;
 							$array['recordings'][0]['recording_name'] = $recording_name;
 							$array['recordings'][0]['recording_description'] = $recording_description;
-							if ($_SESSION['recordings']['storage_type']['text'] == 'base64') {
-								$recording_base64 = base64_encode(file_get_contents($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$recording_filename));
+							if ($recording_storage_type == 'base64') {
+								$recording_base64 = base64_encode(file_get_contents($switch_recordings.'/'.$domain_name.'/'.$recording_filename));
 								$array['recordings'][0]['recording_base64'] = $recording_base64;
 							}
 						//set temporary permissions
@@ -229,10 +253,10 @@
 					}
 					else {
 						//file found in db, check if base64 present
-							if (!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] == 'base64') {
+							if ($recording_storage_type == 'base64') {
 								$found_recording_uuid = array_search($recording_filename, $array_recordings);
 								if (!$array_base64_exists[$found_recording_uuid]) {
-									$recording_base64 = base64_encode(file_get_contents($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$recording_filename));
+									$recording_base64 = base64_encode(file_get_contents($switch_recordings.'/'.$domain_name.'/'.$recording_filename));
 									//build array
 										$array['recordings'][0]['domain_uuid'] = $domain_uuid;
 										$array['recordings'][0]['recording_uuid'] = $found_recording_uuid;
@@ -296,7 +320,7 @@
 	$sql .= "where true ";
 	if ($show != "all" || !permission_exists('conference_center_all')) {
 		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['domain_uuid'] = $domain_uuid;
 	}
 	if (!empty($search)) {
 		$sql .= "and (";
@@ -309,7 +333,7 @@
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
-	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
+	$rows_per_page = ($domain_paging != '') ? $domain_paging : 50;
 	$param = "&search=".urlencode($search);
 	if ($show == "all" && permission_exists('recording_all')) {
 		$param .= "&show=all";
@@ -321,7 +345,7 @@
 	$offset = $rows_per_page * $page;
 
 //get the file size
-	if (!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] == 'base64') {
+	if ($recording_storage_type == 'base64') {
 		switch ($db_type) {
 			case 'pgsql': $sql_file_size = "length(decode(recording_base64,'base64')) as recording_size, "; break;
 			case 'mysql': $sql_file_size = "length(from_base64(recording_base64)) as recording_size, "; break;
@@ -331,12 +355,14 @@
 //get the recordings from the database
 	$sql = "select recording_uuid, domain_uuid, ";
 	if (!empty($sql_file_size)) { $sql .= $sql_file_size; }
+	$sql .= "to_char(timezone(:time_zone, update_date), 'DD Mon YYYY') as date_formatted, \n";
+	$sql .= "to_char(timezone(:time_zone, update_date), '".$sql_time_format."') as time_formatted, \n";
 	$sql .= "recording_name, recording_filename, recording_description ";
 	$sql .= "from v_recordings ";
 	$sql .= "where true ";
 	if ($show != "all" || !permission_exists('conference_center_all')) {
 		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['domain_uuid'] = $domain_uuid;
 	}
 	if (!empty($search)) {
 		$sql .= "and (";
@@ -348,13 +374,14 @@
 	}
 	$sql .= order_by($order_by, $order, 'recording_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
+	$parameters['time_zone'] = $time_zone;
 	$recordings = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
 //get current recordings password
 	if (permission_exists('recording_password')) {
-		if (isset($_SESSION['recordings']['recording_password']['numeric'])) {
-			$recording_password = $_SESSION['recordings']['recording_password']['numeric'];
+		if (!empty($recording_password)) {
+			$recording_password = $recording_password;
 		}
 		else {
 			$sql = "
@@ -373,7 +400,7 @@
 					dd.dialplan_detail_type = 'set' and
 					dd.dialplan_detail_data like 'pin_number=%' and
 					dd.dialplan_detail_enabled = 'true' ";
-			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$parameters['domain_uuid'] = $domain_uuid;
 			$recording_password = $database->select($sql, $parameters, 'column');
 			unset($sql, $parameters);
 		}
@@ -402,7 +429,7 @@
 	echo "	<div class='heading'><b>".$text['title-recordings']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
 	echo "	<div class='actions'>\n";
 	if (permission_exists('recording_add') && $speech_enabled == 'true') {
-		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'recording_edit.php']);
+		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$theme_button_icon_add,'id'=>'btn_add','link'=>'recording_edit.php']);
 	}
 	if (permission_exists('recording_upload')) {
 		echo 	"<form id='form_upload' class='inline' method='post' enctype='multipart/form-data'>\n";
@@ -410,17 +437,17 @@
 		echo 	"<input name='type' type='hidden' value='rec'>\n";
 		echo 	"<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 
-		echo button::create(['type'=>'button','label'=>$text['button-upload'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_upload','onclick'=>"$(this).fadeOut(250, function(){ $('span#form_upload').fadeIn(250); document.getElementById('ulfile').click(); });"]);
+		echo button::create(['type'=>'button','label'=>$text['button-upload'],'icon'=>$theme_button_icon_add,'id'=>'btn_upload','onclick'=>"$(this).fadeOut(250, function(){ $('span#form_upload').fadeIn(250); document.getElementById('ulfile').click(); });"]);
 		echo 	"<span id='form_upload' style='display: none;'>";
-		echo button::create(['label'=>$text['button-cancel'],'icon'=>$_SESSION['theme']['button_icon_cancel'],'type'=>'button','id'=>'btn_upload_cancel','onclick'=>"$('span#form_upload').fadeOut(250, function(){ document.getElementById('form_upload').reset(); $('#btn_upload').fadeIn(250) });"]);
+		echo button::create(['label'=>$text['button-cancel'],'icon'=>$theme_button_icon_cancel,'type'=>'button','id'=>'btn_upload_cancel','onclick'=>"$('span#form_upload').fadeOut(250, function(){ document.getElementById('form_upload').reset(); $('#btn_upload').fadeIn(250) });"]);
 		echo 		"<input type='text' class='txt' style='width: 100px; cursor: pointer;' id='filename' placeholder='Select...' onclick=\"document.getElementById('ulfile').click(); this.blur();\" onfocus='this.blur();'>";
 		echo 		"<input type='file' id='ulfile' name='file' style='display: none;' accept='.wav,.mp3,.ogg' onchange=\"document.getElementById('filename').value = this.files.item(0).name; check_file_type(this);\">";
-		echo button::create(['type'=>'submit','label'=>$text['button-upload'],'icon'=>$_SESSION['theme']['button_icon_upload']]);
+		echo button::create(['type'=>'submit','label'=>$text['button-upload'],'icon'=>$theme_button_icon_upload]);
 		echo 	"</span>\n";
 		echo 	"</form>";
 	}
 	if (permission_exists('recording_delete') && $recordings) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$theme_button_icon_delete,'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
 	if (permission_exists('recording_all')) {
@@ -428,12 +455,12 @@
 			echo "		<input type='hidden' name='show' value='all'>";
 		}
 		else {
-			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
+			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$theme_button_icon_all,'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
 		}
 	}
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
-	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
-	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'recordings.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-search'],'icon'=>$theme_button_icon_search,'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$theme_button_icon_reset,'type'=>'button','id'=>'btn_reset','link'=>'recordings.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -473,7 +500,7 @@
 	}
 	echo th_order_by('recording_name', $text['label-recording_name'], $order_by, $order);
 	$col_count++;
-	if (!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] != 'base64') {
+	if ($recording_storage_type != 'base64') {
 		echo th_order_by('recording_filename', $text['label-file_name'], $order_by, $order, null, "class='hide-md-dn'");
 		$col_count++;
 	}
@@ -481,7 +508,7 @@
 		echo "<th class='center shrink'>".$text['label-tools']."</th>\n";
 		$col_count++;
 	}
-	echo "<th class='center'>".(!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] == 'base64' ? $text['label-size'] : $text['label-file_size'])."</th>\n";
+	echo "<th class='center'>".($recording_storage_type == 'base64' ? $text['label-size'] : $text['label-file_size'])."</th>\n";
 	$col_count++;
 
 	echo "<th class='center hide-md-dn'>".$text['label-date']."</th>\n";
@@ -489,7 +516,7 @@
 
 	echo th_order_by('recording_description', $text['label-description'], $order_by, $order, null, "class='hide-sm-dn pct-25'");
 	$col_count++;
-	if (permission_exists('recording_edit') && !empty($_SESSION['theme']['list_row_edit_button']['boolean']) && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+	if (permission_exists('recording_edit') && $theme_list_row_edit_button == true) {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
 	echo "</tr>\n";
@@ -513,8 +540,8 @@
 				echo "	</td>\n";
 			}
 			if ($show == "all" && permission_exists('recording_all')) {
-				if (!empty($_SESSION['domains'][$row['domain_uuid']]['domain_name'])) {
-					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				if (!empty($domains[$row['domain_uuid']]['domain_name'])) {
+					$domain = $domains[$row['domain_uuid']]['domain_name'];
 				}
 				else {
 					$domain = $text['label-global'];
@@ -529,7 +556,7 @@
 				echo escape($row['recording_name']);
 			}
 			echo "	</td>\n";
-			if (!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] != 'base64') {
+			if ($recording_storage_type != 'base64') {
 				echo "	<td class='hide-md-dn'>".str_replace('_', '_&#8203;', escape($row['recording_filename']))."</td>\n";
 			}
 			if (permission_exists('recording_play') || permission_exists('recording_download')) {
@@ -544,19 +571,19 @@
 						case "ogg" : $recording_type = "audio/ogg"; break;
 					}
 					echo "<audio id='recording_audio_".escape($row['recording_uuid'])."' style='display: none;' preload='none' ontimeupdate=\"update_progress('".escape($row['recording_uuid'])."')\" onended=\"recording_reset('".escape($row['recording_uuid'])."');\" src=\"".PROJECT_PATH."/app/recordings/recordings.php?action=download&type=rec&id=".urlencode($row['recording_uuid'])."\" type='".$recording_type."'></audio>";
-					echo button::create(['type'=>'button','title'=>$text['label-play'].' / '.$text['label-pause'],'icon'=>$_SESSION['theme']['button_icon_play'],'id'=>'recording_button_'.escape($row['recording_uuid']),'onclick'=>"recording_play('".escape($row['recording_uuid'])."')"]);
+					echo button::create(['type'=>'button','title'=>$text['label-play'].' / '.$text['label-pause'],'icon'=>$theme_button_icon_play,'id'=>'recording_button_'.escape($row['recording_uuid']),'onclick'=>"recording_play('".escape($row['recording_uuid'])."')"]);
 				}
 				if (permission_exists('recording_download')) {
-					echo button::create(['type'=>'button','title'=>$text['label-download'],'icon'=>$_SESSION['theme']['button_icon_download'],'link'=>"recordings.php?action=download&type=rec&t=bin&id=".urlencode($row['recording_uuid'])]);
+					echo button::create(['type'=>'button','title'=>$text['label-download'],'icon'=>$theme_button_icon_download,'link'=>"recordings.php?action=download&type=rec&t=bin&id=".urlencode($row['recording_uuid'])]);
 				}
 				echo "	</td>\n";
 			}
-			if (!empty($_SESSION['recordings']['storage_type']['text']) && $_SESSION['recordings']['storage_type']['text'] == 'base64') {
+			if ($recording_storage_type == 'base64') {
 				$file_size = byte_convert($row['recording_size']);
 				echo "	<td class='center no-wrap'>".$file_size."</td>\n";
 			}
 			else {
-				$file_name = $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domains'][$row['domain_uuid']]['domain_name'].'/'.$row['recording_filename'];
+				$file_name = $switch_recordings.'/'.$domains[$row['domain_uuid']]['domain_name'].'/'.$row['recording_filename'];
 				if (file_exists($file_name)) {
 					$file_size = filesize($file_name);
 					$file_size = byte_convert($file_size);
@@ -566,18 +593,17 @@
 					unset($file_size, $file_date);
 				}
 				echo "	<td class='center no-wrap'>".($file_size ?? '')."</td>\n";
-				echo "	<td class='center hide-md-dn'>".($file_date ?? '')."</td>\n";
 			}
+			echo "	<td class='center hide-md-dn'>".($row['date_formatted'] ?? '')." ".($row['time_formatted'] ?? '')."</td>\n";
 			echo "	<td class='description overflow hide-sm-dn'>".escape($row['recording_description'])."&nbsp;</td>\n";
-			if (permission_exists('recording_edit') && !empty($_SESSION['theme']['list_row_edit_button']['boolean']) && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+			if (permission_exists('recording_edit') && $theme_list_row_edit_button == true) {
 				echo "	<td class='action-button'>";
-				echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
+				echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$theme_button_icon_edit,'link'=>$list_row_url]);
 				echo "	</td>\n";
 			}
 			echo "</tr>\n";
 			$x++;
 		}
-		unset($recordings);
 	}
 
 	echo "</table>\n";
diff --git a/app/registrations/resources/classes/registrations.php b/app/registrations/resources/classes/registrations.php
index 7d5122b051..9ae9d71c7b 100644
--- a/app/registrations/resources/classes/registrations.php
+++ b/app/registrations/resources/classes/registrations.php
@@ -36,18 +36,47 @@ if (!class_exists('registrations')) {
 		private $permission_prefix;
 		private $list_page;
 		public $show;
+		private $domain_name;
+
+		/**
+		 * Set in the constructor. Must be a database object and cannot be null.
+		 * @var database Database Object
+		 */
+		private $database;
 
 		/**
 		 * called when the object is created
 		 */
-		public function __construct() {
+		public function __construct($setting_array = []) {
+
+			//open a database connection
+			if (empty($setting_array['database'])) {
+				$this->database = database::new();
+			}
+			else {
+				$this->database = $setting_array['database'];
+			}
+
+			//trap passing a PDO object instead of the required database object
+			if (!($this->database instanceof database)) {
+				//should never happen but will trap it here just-in-case
+				throw new \InvalidArgumentException("Database object passed in settings class constructor is not a valid database object");
+			}
 
 			//assign private variables
-				$this->app_name = 'registrations';
-				$this->app_uuid = '5d9e7cd7-629e-3553-4cf5-f26e39fefa39';
-				$this->permission_prefix = 'registration_';
-				$this->list_page = 'registrations.php';
-				$this->show = 'local';
+			$this->app_name = 'registrations';
+			$this->app_uuid = '5d9e7cd7-629e-3553-4cf5-f26e39fefa39';
+			$this->permission_prefix = 'registration_';
+			$this->list_page = 'registrations.php';
+			$this->show = 'local';
+
+			//get the domain_name
+			if (empty($setting_array['domain_name'])) {
+				$this->domain_name = $_SESSION['domain_name'];
+			}
+			else {
+				$this->domain_name = $setting_array['domain_name'];
+			}
 
 		}
 
@@ -70,8 +99,7 @@ if (!class_exists('registrations')) {
 					$parameters['sip_profile_name'] = $profile;
 				}
 				$sql .= "and sip_profile_enabled = 'true' ";
-				$database = new database;
-				$sip_profiles = $database->select($sql, $parameters ?? null, 'all');
+				$sip_profiles = $this->database->select($sql, $parameters ?? null, 'all');
 				if (!empty($sip_profiles) && @sizeof($sip_profiles) != 0) {
 					foreach ($sip_profiles as $field) {
 
@@ -180,8 +208,8 @@ if (!class_exists('registrations')) {
 
 									//remove unrelated domains
 										if (!permission_exists('registration_all') || $this->show != 'all') {
-											if ($registrations[$id]['sip-auth-realm'] == $_SESSION['domain_name']) {}
-											else if ($user_array[1] == $_SESSION['domain_name']) {}
+											if ($registrations[$id]['sip-auth-realm'] == $this->domain_name) {}
+											else if ($user_array[1] == $this->domain_name) {}
 											else {
 												unset($registrations[$id]);
 											}
@@ -269,8 +297,7 @@ if (!class_exists('registrations')) {
 
 						//retrieve sip profiles list
 							$sql = "select sip_profile_name as name from v_sip_profiles ";
-							$database = new database;
-							$sip_profiles = $database->select($sql, null, 'all');
+							$sip_profiles = $this->database->select($sql, null, 'all');
 							unset($sql);
 
 						//create the event socket connection
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 4da6c44602..647ebb4e18 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -849,6 +849,16 @@
 						unset($selected);
 					}
 				}
+				else if ($key == 'phrases') {
+					if (!empty($instance_value) && $instance_value == $row["value"]) {
+						$selected = "selected='selected'";
+						$playable = '';
+						$found = true;
+					}
+					else {
+						unset($selected);
+					}
+				}
 				else {
 					unset($selected);
 				}
diff --git a/app/switch/resources/classes/presence.php b/app/switch/resources/classes/presence.php
index 014c04771e..b455c24a6d 100644
--- a/app/switch/resources/classes/presence.php
+++ b/app/switch/resources/classes/presence.php
@@ -100,7 +100,7 @@ if (!class_exists('presence')) {
 			echo "active: false\n";	
 		}
 	//show active the presence
-		$presence = new permissions;
+		$presence = new presence;
 		$array = $presence->show();
 	*/
 
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 8ed1b8a675..4785ad81da 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -97,12 +97,12 @@
 			$voicemail_sms_to = $_POST["voicemail_sms_to"] ?? null;
 			$voicemail_transcription_enabled = $_POST["voicemail_transcription_enabled"] ?? null;
 			$voicemail_file = $_POST["voicemail_file"];
-			$voicemail_local_after_email = $_POST["voicemail_local_after_email"];
+			$voicemail_local_after_email = $_POST["voicemail_local_after_email"] ?? null;
 			$voicemail_destination = $_POST["voicemail_destination"];
-			$voicemail_local_after_forward = $_POST["voicemail_local_after_forward"];
+			$voicemail_local_after_forward = $_POST["voicemail_local_after_forward"] ?? null;
 			$voicemail_enabled = $_POST["voicemail_enabled"] ?? 'false';
 			$voicemail_description = $_POST["voicemail_description"];
-			$voicemail_tutorial = $_POST["voicemail_tutorial"];
+			$voicemail_tutorial = $_POST["voicemail_tutorial"] ?? null;
 			$voicemail_recording_instructions = $_POST["voicemail_recording_instructions"] ?? null;
 			$voicemail_recording_options = $_POST["voicemail_recording_options"] ?? null;
 			$voicemail_options_delete = $_POST["voicemail_options_delete"] ?? null;
@@ -153,7 +153,7 @@
 						$voicemail_uuid = uuid();
 						//if adding a mailbox and don't have the transcription permission, set the default transcribe behavior
 						if (!permission_exists('voicemail_transcription_enabled') && isset($_SESSION['voicemail']['transcription_enabled_default']['boolean'])) {
-							$voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean'];
+							$voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean'] ?? 'false';
 						}
 					}
 
@@ -167,30 +167,30 @@
 					$array['voicemails'][0]['voicemail_mail_to'] = $voicemail_mail_to;
 					$array['voicemails'][0]['voicemail_sms_to'] = $voicemail_sms_to;
 					$array['voicemails'][0]['voicemail_transcription_enabled'] = $voicemail_transcription_enabled;
-					$array['voicemails'][0]['voicemail_tutorial'] = $voicemail_tutorial;
+					$array['voicemails'][0]['voicemail_tutorial'] = $voicemail_tutorial ?? 'false';
 					if (permission_exists('voicemail_recording_instructions')) {
-						$array['voicemails'][0]['voicemail_recording_instructions'] = $voicemail_recording_instructions;
+						$array['voicemails'][0]['voicemail_recording_instructions'] = $voicemail_recording_instructions ?? 'false';
 					}
 					if (permission_exists('voicemail_recording_options')) {
-						$array['voicemails'][0]['voicemail_recording_options'] = $voicemail_recording_options;
+						$array['voicemails'][0]['voicemail_recording_options'] = $voicemail_recording_options ?? 'false';
 					}
 					if (permission_exists('voicemail_file')) {
 						$array['voicemails'][0]['voicemail_file'] = $voicemail_file;
 					}
 					if (permission_exists('voicemail_local_after_email') && !empty($voicemail_mail_to)) {
-						$array['voicemails'][0]['voicemail_local_after_email'] = $voicemail_local_after_email;
+						$array['voicemails'][0]['voicemail_local_after_email'] = $voicemail_local_after_email ?? 'false';
 					}
 					else if (permission_exists('voicemail_local_after_forward')) {
-						$array['voicemails'][0]['voicemail_local_after_email'] = $voicemail_local_after_forward;
+						$array['voicemails'][0]['voicemail_local_after_email'] = $voicemail_local_after_forward ?? 'false';
 					}
 					else {
 						$array['voicemails'][0]['voicemail_local_after_email'] = 'true';
 					}
 					if (permission_exists('voicemail_local_after_forward')) {
-						$array['voicemails'][0]['voicemail_local_after_forward'] = $voicemail_local_after_forward;
+						$array['voicemails'][0]['voicemail_local_after_forward'] = $voicemail_local_after_forward ?? 'false';
 					}
 					else if (permission_exists('voicemail_local_after_email') && !empty($voicemail_mail_to)) {
-						$array['voicemails'][0]['voicemail_local_after_forward'] = $voicemail_local_after_email;
+						$array['voicemails'][0]['voicemail_local_after_forward'] = $voicemail_local_after_email ?? 'false';
 					}
 					else {
 						$array['voicemails'][0]['voicemail_local_after_forward'] = 'true';
@@ -583,10 +583,18 @@
 	echo "	".$text['label-voicemail_tutorial']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<select class='formfld' name='voicemail_tutorial' id='voicemail_tutorial'>\n";
-	echo "    	<option value='true' ".(($voicemail_tutorial == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
-	echo "    	<option value='false' ".(($voicemail_tutorial == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-	echo "	</select>\n";
+	if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+		echo "	<label class='switch'>\n";
+		echo "		<input type='checkbox' id='voicemail_tutorial' name='voicemail_tutorial' value='true' ".($voicemail_tutorial == 'true' ? "checked='checked'" : null).">\n";
+		echo "		<span class='slider'></span> \n";
+		echo "	</label>\n";
+	}
+	else {
+		echo "	<select class='formfld' id='voicemail_tutorial' name='voicemail_tutorial'>\n";
+		echo "		<option value='true'>".$text['option-true']."</option>\n";
+		echo "		<option value='false' ".($voicemail_tutorial == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+		echo "	</select>\n";
+	}
 	echo "<br />\n";
 	echo $text['description-voicemail_tutorial']."\n";
 	echo "</td>\n";
@@ -683,10 +691,18 @@
 		echo "	".$text['label-recording_instructions']."\n";
 		echo "</td>\n";
 		echo "<td width='70%' class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='voicemail_recording_instructions' id='voicemail_recording_instructions'>\n";
-		echo "    	<option value='true'>".$text['label-true']."</option>\n";
-		echo "    	<option value='false' ".(!empty($voicemail_recording_instructions) && $voicemail_recording_instructions == "false" ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-		echo "	</select>\n";
+		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+			echo "	<label class='switch'>\n";
+			echo "		<input type='checkbox' id='voicemail_recording_instructions' name='voicemail_recording_instructions' value='true' ".($voicemail_recording_instructions == 'true' ? "checked='checked'" : null).">\n";
+			echo "		<span class='slider'></span> \n";
+			echo "	</label>\n";
+		}
+		else {
+			echo "	<select class='formfld' id='voicemail_recording_instructions' name='voicemail_recording_instructions'>\n";
+			echo "		<option value='true'>".$text['option-true']."</option>\n";
+			echo "		<option value='false' ".(!empty($voicemail_recording_instructions) && $voicemail_recording_instructions == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+			echo "	</select>\n";
+		}
 		echo "<br />\n";
 		echo $text['description-recording_instructions']."\n";
 		echo "</td>\n";
@@ -699,10 +715,18 @@
 		echo "	".$text['label-recording_options']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='voicemail_recording_options' id='voicemail_recording_options'>\n";
-		echo "    	<option value='true'>".$text['label-true']."</option>\n";
-		echo "    	<option value='false' ".(!empty($voicemail_recording_options) && $voicemail_recording_options == "false" ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-		echo "	</select>\n";
+		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+			echo "	<label class='switch'>\n";
+			echo "		<input type='checkbox' id='voicemail_recording_options' name='voicemail_recording_options' value='true' ".($voicemail_recording_options == 'true' ? "checked='checked'" : null).">\n";
+			echo "		<span class='slider'></span> \n";
+			echo "	</label>\n";
+		}
+		else {
+			echo "	<select class='formfld' id='voicemail_recording_options' name='voicemail_recording_options'>\n";
+			echo "		<option value='true'>".$text['option-true']."</option>\n";
+			echo "		<option value='false' ".(!empty($voicemail_recording_options) && $voicemail_recording_options == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+			echo "	</select>\n";
+		}
 		echo "<br />\n";
 		echo $text['description-recording_options']."\n";
 		echo "</td>\n";
@@ -820,10 +844,18 @@
 		echo "	".$text['label-voicemail_transcription_enabled']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='voicemail_transcription_enabled' id='voicemail_transcription_enabled'>\n";
-		echo "    	<option value='true' ".(($voicemail_transcription_enabled == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
-		echo "    	<option value='false' ".((empty($voicemail_transcription_enabled) || $voicemail_transcription_enabled == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-		echo "	</select>\n";
+		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+			echo "	<label class='switch'>\n";
+			echo "		<input type='checkbox' id='voicemail_transcription_enabled' name='voicemail_transcription_enabled' value='true' ".($voicemail_transcription_enabled == 'true' ? "checked='checked'" : null).">\n";
+			echo "		<span class='slider'></span> \n";
+			echo "	</label>\n";
+		}
+		else {
+			echo "	<select class='formfld' id='voicemail_transcription_enabled' name='voicemail_transcription_enabled'>\n";
+			echo "		<option value='true'>".$text['option-true']."</option>\n";
+			echo "		<option value='false' ".(empty($voicemail_transcription_enabled) || $voicemail_transcription_enabled == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+			echo "	</select>\n";
+		}
 		echo "<br />\n";
 		echo $text['description-voicemail_transcription_enabled']."\n";
 		echo "</td>\n";
@@ -856,10 +888,18 @@
 		echo "	".$text['label-voicemail_local_after_email']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='voicemail_local_after_email' id='voicemail_local_after_email' onchange=\"if (this.selectedIndex == 1) { document.getElementById('voicemail_file').selectedIndex = 2; }\">\n";
-		echo "    	<option value='true' ".(($voicemail_local_after_email == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
-		echo "    	<option value='false' ".(($voicemail_local_after_email == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-		echo "	</select>\n";
+		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+			echo "	<label class='switch'>\n";
+			echo "		<input type='checkbox' id='voicemail_local_after_email' name='voicemail_local_after_email' value='true' ".($voicemail_local_after_email == 'true' ? "checked='checked'" : null)." onchange=\"if (!this.checked) { document.getElementById('voicemail_file').selectedIndex = 2; }\">\n";
+			echo "		<span class='slider'></span> \n";
+			echo "	</label>\n";
+		}
+		else {
+			echo "	<select class='formfld' id='voicemail_local_after_email' name='voicemail_local_after_email' onchange=\"if (this.selectedIndex == 1) { document.getElementById('voicemail_file').selectedIndex = 2; }\">\n";
+			echo "		<option value='true'>".$text['option-true']."</option>\n";
+			echo "		<option value='false' ".($voicemail_local_after_email == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+			echo "	</select>\n";
+		}
 		echo "<br />\n";
 		echo $text['description-voicemail_local_after_email']."\n";
 		echo "</td>\n";
@@ -927,10 +967,18 @@
 		echo "	".$text['label-voicemail_local_after_forward']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='voicemail_local_after_forward'>\n";
-		echo "    	<option value='true' ".(($voicemail_local_after_forward == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
-		echo "    	<option value='false' ".(($voicemail_local_after_forward == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-		echo "	</select>\n";
+		if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
+			echo "	<label class='switch'>\n";
+			echo "		<input type='checkbox' id='voicemail_local_after_forward' name='voicemail_local_after_forward' value='true' ".($voicemail_local_after_forward == 'true' ? "checked='checked'" : null).">\n";
+			echo "		<span class='slider'></span> \n";
+			echo "	</label>\n";
+		}
+		else {
+			echo "	<select class='formfld' id='voicemail_local_after_forward' name='voicemail_local_after_forward'>\n";
+			echo "		<option value='true'>".$text['option-true']."</option>\n";
+			echo "		<option value='false' ".($voicemail_local_after_forward == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+			echo "	</select>\n";
+		}
 		echo "<br />\n";
 		echo $text['description-voicemail_local_after_forward']."\n";
 		echo "</td>\n";
diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php
index 435a3be647..28dab54440 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -119,7 +119,6 @@
 		$sql_search .= " 	or lower(voicemail_enabled) like :search ";
 		$sql_search .= " 	or lower(voicemail_description) like :search ";
 		$sql_search .= ") ";
-		$parameters['search'] = '%'.$search.'%';
 	}
 
 //prepare to page the results
@@ -146,7 +145,10 @@
 			$sql .= "and voicemail_uuid is null ";
 		}
 	}
-	$sql .= $sql_search ?? '';
+	if (!empty($sql_search)) {
+		$sql .= $sql_search;
+		$parameters['search'] = '%'.$search.'%';
+	}
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index a15d65479a..98f5944920 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -214,7 +214,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_hangup_cause";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_details";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -231,7 +230,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_archive";
-		//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_statistics";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 8a5e20bb98..d7d2726bdd 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -614,6 +614,10 @@ if (!class_exists('xml_cdr')) {
 						$domain_name = urldecode($xml->variables->domain_name);
 						$domain_uuid = urldecode($xml->variables->domain_uuid);
 
+					//sanitize the caller ID
+						$caller_id_name = preg_replace('#[^a-zA-Z 0-9\-\.]#', '', $caller_id_name);
+						$caller_id_number = preg_replace('#[^0-9\-]#', '', $caller_id_number);
+
 					//misc
 						$this->array[$key][0]['ring_group_uuid'] = urldecode($xml->variables->ring_group_uuid);
 						$this->array[$key][0]['xml_cdr_uuid'] = $uuid;
@@ -634,6 +638,17 @@ if (!class_exists('xml_cdr')) {
 						$this->array[$key][0]['status'] = $status;
 
 					//time
+						//catch invalid call detail records
+						if (empty($xml->variables->start_epoch)) {
+							//empty the array so it can't save
+							$this->array = null;
+
+							//move the file to the failed location
+							$this->move_to_failed($this->file);
+
+							//stop processing
+							return;
+						}
 						$start_epoch = urldecode($xml->variables->start_epoch);
 						$this->array[$key][0]['start_epoch'] = $start_epoch;
 						$this->array[$key][0]['start_stamp'] = is_numeric((int)$start_epoch) ? date('c', $start_epoch) : null;
@@ -1482,6 +1497,15 @@ if (!class_exists('xml_cdr')) {
 			}
 		}
 
+		public function moved_to_failed($failed_file) {
+			$xml_cdr_dir = $this->setting->get('switch', 'log', '/var/log/freeswitch').'/xml_cdr';
+			if (!file_exists($xml_cdr_dir.'/failed')) {
+				if (!mkdir($xml_cdr_dir.'/failed', 0660, true)) {
+					die('Failed to create '.$xml_cdr_dir.'/failed');
+				}
+			}
+			rename($xml_cdr_dir.'/'.$failed_file, $xml_cdr_dir.'/failed/'.$failed_file);
+		}
 
 		/**
 		 * get xml from the filesystem and save it to the database
@@ -1528,8 +1552,23 @@ if (!class_exists('xml_cdr')) {
 								$import = true;
 							}
 
+						//move the files that are too large or zero file size to the failed directory
+							if ($import && (filesize($xml_cdr_dir.'/'.$file) >= 3000000 || filesize($xml_cdr_dir.'/'.$file) == 0)) {
+								//echo "WARNING: File too large or zero file size. Moving $file to failed\n";
+								if (!empty($xml_cdr_dir)) {
+									if (!file_exists($xml_cdr_dir.'/failed')) {
+										if (!mkdir($xml_cdr_dir.'/failed', 0660, true)) {
+											die('Failed to create '.$xml_cdr_dir.'/failed');
+										}
+									}
+									if (rename($xml_cdr_dir.'/'.$file, $xml_cdr_dir.'/failed/'.$file)) {
+										//echo "Moved $file successfully\n";
+									}
+								}
+							}
+
 						//import the call detail files are less than 3 mb - 3 million bytes
-							if ($import && filesize($xml_cdr_dir.'/'.$file) <= 3000000) {
+							if ($import) {
 								//get the xml cdr string
 									$call_details = file_get_contents($xml_cdr_dir.'/'.$file);
 
@@ -1548,18 +1587,6 @@ if (!class_exists('xml_cdr')) {
 									$x++;
 							}
 
-						//move the files that are too large to the failed directory
-							if ($import && filesize($xml_cdr_dir.'/'.$file) >= 3000000) {
-								if (!empty($xml_cdr_dir)) {
-									if (!file_exists($xml_cdr_dir.'/failed')) {
-										if (!mkdir($xml_cdr_dir.'/failed', 0660, true)) {
-											die('Failed to create '.$xml_cdr_dir.'/failed');
-										}
-									}
-									rename($xml_cdr_dir.'/'.$file, $xml_cdr_dir.'/failed/'.$file);
-								}
-							}
-
 						//if limit exceeded exit the loop
 							if ($limit == $x) {
 								//echo "limit: $limit count: $x if\n";
@@ -1729,7 +1756,7 @@ if (!class_exists('xml_cdr')) {
 				$sql .= "filter ( \n";
 				$sql .= " where c.extension_uuid = e.extension_uuid \n";
 				$sql .= " and status = 'answered' \n";
-			 	if (!$this->include_internal) {
+				if (!$this->include_internal) {
 					$sql .= "and (direction = 'inbound' or direction = 'outbound') \n";
 				}
 				$sql .= ") \n";
@@ -1741,7 +1768,7 @@ if (!class_exists('xml_cdr')) {
 				$sql .= " where c.extension_uuid = e.extension_uuid \n";
 				$sql .= " and status = 'missed' \n";
 				$sql .= " and (cc_side is null or cc_side != 'agent') \n";
-			 	if (!$this->include_internal) {
+				if (!$this->include_internal) {
 					$sql .= "and (direction = 'inbound' or direction = 'outbound') \n";
 				}
 				$sql .= ") \n";
@@ -1752,7 +1779,7 @@ if (!class_exists('xml_cdr')) {
 				$sql .= "filter ( \n";
 				$sql .= " where c.extension_uuid = e.extension_uuid \n";
 				$sql .= " and status = 'voicemail' \n";
-			 	if (!$this->include_internal) {
+				if (!$this->include_internal) {
 					$sql .= "and (direction = 'inbound' or direction = 'outbound') \n";
 				}
 				$sql .= ") \n";
@@ -2252,5 +2279,3 @@ if (!class_exists('xml_cdr')) {
 
 	} //class
 }
-
-?>
diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php
index 9a688a85cd..37b7247804 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -329,7 +329,7 @@
 		}
 		echo "	<td>".escape($row['volume'])."&nbsp;</td>\n";
 		echo "	<td>".escape(round($row['minutes'] ?? 0, 2))."&nbsp;</td>\n";
-		echo "	<td>".escape(round($row['avg_min'] ?? 0, 2))."&nbsp;/&nbsp;".escape(round($row['cpm_ans'] ?? 0, 2))."&nbsp;</td>\n";
+		echo "	<td>".escape(round($row['avg_min'] ?? 0, 2))."&nbsp;/&nbsp;".escape(round($row['cpm_answered'] ?? 0, 2))."&nbsp;</td>\n";
 		echo "	<td class='center'><a href=\"xml_cdr.php?call_result=missed&direction=".$direction."&start_epoch=".escape($row['start_epoch'] ?? '')."&stop_epoch=".escape($row['stop_epoch'] ?? '')."\">".escape($row['missed'] ?? '')."</a>&nbsp;</td>\n";
 		echo "	<td>".escape(round($row['asr'] ?? 0, 2))."&nbsp;</td>\n";
 		echo "	<td>".escape(round($row['aloc'] ?? 0, 2))."&nbsp;</td>\n";
diff --git a/core/contacts/contact_import.php b/core/contacts/contact_import.php
index 55984a97e8..59fa99964a 100644
--- a/core/contacts/contact_import.php
+++ b/core/contacts/contact_import.php
@@ -92,7 +92,7 @@
 
 		//get the schema
 			$x = 0;
-			include "app/contacts/app_config.php";
+			include "core/contacts/app_config.php";
 			$i = 0;
 			foreach ($apps[0]['db'] as $table) {
 				//get the table name and parent name
@@ -149,7 +149,6 @@
 			}
 
 		//create token
-			$object = new token;
 			$token = $object->create($_SERVER['PHP_SELF']);
 
 		//include header
diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 194956d409..0b3db46e28 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -1237,7 +1237,7 @@ if (!class_exists('menu')) {
 					$html .= "	<div style='height: 100px;'></div>\n";
 				}
 			$html .= "</div>\n";
-			if ($menu_side_state != 'hidden') {
+			if ($menu_side_state != 'expanded') {
 				$content_container_onclick = "onclick=\"clearTimeout(menu_side_contract_timer); if ($(window).width() >= 576) { menu_side_contract(); }\"";
 			}
 			$html .= "<div id='content_container' ".$content_container_onclick.">\n";
@@ -1286,7 +1286,7 @@ if (!class_exists('menu')) {
 			//header: left
 				$html .= "<div class='float-left'>\n";
 				// $html .= button::create(['type'=>'button','id'=>'menu_side_state_hidden_button','title'=>$this->text['theme-label-expand_menu'],'icon'=>'bars','class'=>'default '.($this->settings->get('theme', 'menu_side_state') != 'hidden' ? 'hide-sm-up ' : null).'float-left','onclick'=>'menu_side_expand();']);
-				$html .= "<a id='menu_side_state_hidden_button' class='$menu_side_state_class' href='show:menu' onclick=\"event.preventDefault(); menu_side_expand();\" title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='margin: 7px 10px 5px 10px;'></i></a>";
+				$html .= "<a id='menu_side_state_hidden_button' class='$menu_side_state_class' href='show:menu' onclick=\"event.preventDefault(); menu_side_expand(); event.stopPropagation();\" title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='margin: 7px 10px 5px 10px;'></i></a>";
 				$body_header_brand_text = escape($this->settings->get('theme', 'body_header_brand_text', 'FusionPBX'));
 				if ($this->settings->get('theme', 'body_header_brand_type') == 'image' || $this->settings->get('theme', 'body_header_brand_type') == 'image_text') {
 					$body_header_brand_image = $this->settings->get('theme', 'body_header_brand_image', PROJECT_PATH.'/themes/default/images/logo_side_expanded.png');
diff --git a/resources/install/sql/switch.sql b/resources/install/sql/switch.sql
index 84c3588ca1..576a74404a 100644
--- a/resources/install/sql/switch.sql
+++ b/resources/install/sql/switch.sql
@@ -6,7 +6,7 @@ CREATE TABLE agents (
    name character varying(255),
    instance_id character varying(255),
    type character varying(255),
-   contact character varying(255),
+   contact character varying(1024),
    status character varying(255),
    state character varying(255),
    max_no_answer integer DEFAULT 0 NOT NULL,
diff --git a/resources/require.php b/resources/require.php
index 36060569e6..f1ddbd8b06 100644
--- a/resources/require.php
+++ b/resources/require.php
@@ -131,7 +131,6 @@
 	}
 	require_once "resources/functions.php";
 	if (is_array($conf) && count($conf) > 0) {
-		require_once "resources/pdo.php";
 		if (!defined('STDIN')) {
 			require_once "resources/cidr.php";
 		}
diff --git a/resources/templates/provision/grandstream/wp826/phonebook.xml b/resources/templates/provision/grandstream/wp826/phonebook.xml
new file mode 100644
index 0000000000..deb211d001
--- /dev/null
+++ b/resources/templates/provision/grandstream/wp826/phonebook.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<AddressBook>
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
+</AddressBook>
diff --git a/resources/templates/provision/grandstream/wp826/{$mac}.xml b/resources/templates/provision/grandstream/wp826/{$mac}.xml
new file mode 100644
index 0000000000..33ef8d4791
--- /dev/null
+++ b/resources/templates/provision/grandstream/wp826/{$mac}.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gs_provision version="1">
+	<config version="2">
+		<!-- Account General Settings -->
+		{for $line=1 to 3}
+		{$row=$lines.$line}
+		<!-- Account Active -->
+		<!-- Yes, No -->
+		{if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}
+		<item name="account.{$line}.enable">Yes</item>
+
+		<!-- Account Name -->
+		<item name="account.{$line}.name">{$row.display_name}</item>
+
+		<!-- SIP Server -->
+		<item name="account.{$line}.sip.server.1.address">{$row.server_address}</item>
+
+		<!-- SIP User ID -->
+		<item name="account.{$line}.sip.userid">{$row.user_id}</item>
+
+		<!-- SIP Authentication ID -->
+		<item name="account.{$line}.sip.subscriber.userId">{$row.auth_id}</item>
+
+		<!-- SIP Authentication Password -->
+		<item name="account.{$line}.sip.subscriber.password">{$row.password}</item>
+		<!-- Display Name -->
+		<item name="account.{$line}.sip.subscriber.name">{$row.display_name}</item>
+		<!-- Voice Mail Access Number -->
+		<item name="account.{$line}.sip.voicemail.number">{$voicemail_number}</item>
+		<!-- Preferred Vocoder -->
+		<item name="account.{$line}.codec.choice">
+			<part name="1">PCMU</part>
+			<part name="2">PCMA</part>
+			<part name="3">G.722</part>
+			<part name="4">OPUS</part>
+			<part name="5">OPUS</part>
+			<part name="6">OPUS</part>
+			<part name="7">OPUS</part>
+			<part name="8">OPUS</part>
+                </item>
+		<!-- DialPlan -->
+		<item name="account.{$line}.call.dialplan">{$grandstream_dial_plan}</item>
+		{else}
+		<item name="account.{$line}.enable">No</item>
+		{/if} 
+		{/for}
+
+		<!-- Phone Settings - General Settings -->
+		<!-- Ethernet Settings -->
+		<!-- Preferred Internet Protocol -->
+		<!-- BothAndPreferIPv4, BothAndPreferIPv6, IPv4Only, IPv6Only -->
+		{if $grandstream_ipv_mode=='0'}
+		<item name="network.internetProtocol">BothAndPreferIPv4</item>
+		{elseif $grandstream_ipv_mode=='1'}
+		<item name="network.internetProtocol">BothAndPreferIPv6</item>
+		{elseif $grandstream_ipv_mode=='2'}
+		<item name="network.internetProtocol">IPv4Only</item>
+		{elseif $grandstream_ipv_mode=='3'}
+		<item name="network.internetProtocol">IPv6Only</item>
+		{else}
+		<item name="network.internetProtocol">BothAndPreferIPv4</item>
+		{/if} 
+		<!-- Wi-Fi Settings -->
+		<!-- Wi-Fi Function -->
+		{if isset($grandstream_wifi_enable)}
+		<!-- No, Yes -->
+		<item name="wifi.enable">{if filter_var($grandstream_wifi_enable, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
+		<!-- ESSID -->
+		{if isset($grandstream_wifi_essid)}
+		<item name="wifi.essidname">{$grandstream_wifi_essid}</item>
+		<!-- Password -->
+		<item name="wifi.essidpassword">{$grandstream_wifi_password}</item>
+		<!-- Security Mode for Hidden SSID -->
+		<!-- None, WEP, WPA/WPA2_PSK, 802.1X_EAP -->
+		<item name="wifi.hiddenessid.securitymode">{$grandstream_wifi_hidden_security}</item>
+		{/if}
+		<!-- Layer 2 QoS 802.1p Priority Value (Wi-Fi) -->
+		<item name="wifi.layer2qos.priority">0</item>
+		{/if}
+		<!-- System Settings -->
+		<!-- Assign NTP Server Address -->
+		{if isset($ntp_server_primary)}
+		<item name="dateTime.ntp.server.1">{$ntp_server_primary}</item>
+		{else}
+		<item name="dateTime.ntp.server.1">pool.ntp.org</item>
+		{/if}
+
+		<!-- # Secondary NTP Server -->
+		<!-- # String -->
+		{if isset($ntp_server_secondary)}
+		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
+		{else}
+		<item name="dateTime.ntp.server.2">2.us.pool.ntp.org</item>
+		{/if}
+		<!-- Time Zone -->
+		{if isset($grandstream_time_zone) }
+		<item name="dateTime.timezone">{$grandstream_time_zone}</item>
+		{elseif isset($grandstream_gxp_time_zone) }
+		<item name="dateTime.timezone">{$grandstream_gxp_time_zone}</item>
+		{/if}
+		<!-- Admin Password -->
+		{if isset($admin_password)}
+		<item name="users.admin.password">{$admin_password}</item>
+		{/if}
+		<!-- User Password -->
+		{if isset($device_password)}
+		<item name="users.user.password">{$device_password}</item>
+		{/if}
+		<!-- System Settings - TR069 -->
+		<item name="tr069">
+			<part name="connectionRequestUsername">{$mac|replace:'-':''|upper}</part>
+			<part name="url">https://acsguestb.gdms.cloud</part>
+		</item>
+		<!-- Firmware Upgrade Mode -->
+		<!-- TFTP, HTTP, HTTPS -->
+	    	{if isset($grandstream_firmware_upgrade_protocol) }
+    			{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+	    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    			{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    		{else}
+	    	<item name="provisioning.firmware.protocol">HTTP</item>
+    		{/if}
+	    	<!-- Firmware Server Path -->
+		{if isset($grandstream_firmware_path) && isset($firmware_version)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
+		{elseif isset($grandstream_firmware_path)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}</item>
+		{else}
+		<item name="provisioning.firmware.serverPath">{$domain_name}{$project_path}/app/provision/resources/firmware/</item>
+		<item name="provisioning.firmware.username">{$http_auth_username}</item>
+		<item name="provisioning.firmware.password">{$http_auth_password}</item>
+		{/if}
+		<!-- TFTP, HTTP, HTTPS -->
+		<item name="provisioning.config.protocol">HTTPS</item>
+		<!-- Config Server Path -->
+		{if $grandstream_config_server_path=="none"}
+		<item name="provisioning.config.serverPath"></item>
+		{elseif isset($grandstream_config_server_path)}
+		<item name="provisioning.config.serverPath">{$grandstream_config_server_path}</item>
+		{else}
+		<item name="provisioning.config.serverPath">{$domain_name}{$project_path}/app/provision</item>
+		<item name="provisioning.config.username">{$http_auth_username}</item>
+		<item name="provisioning.config.password">{$http_auth_password}</item>
+		{/if}
+		<!-- Phonebook -->
+		<item name="phonebook.download">
+			{if isset($grandstream_phonebook_download)}
+			<part name="mode">{if $grandstream_phonebook_download=="0"}Disabled{elseif $grandstream_phonebook_download=="1"}Enabled Use TFTP{elseif $grandstream_phonebook_download=="2"}Enabled Use HTTP{elseif $grandstream_phonebook_download=="3"}Enabled Use HTTPS{/if}</part>
+			{/if}
+			<part name="server">{$grandstream_phonebook_xml_server_path}{$mac}</part>
+			<part name="interval">{$grandstream_phonebook_download_interval}</part>
+			<part name="username">{$http_auth_username}</part>
+			<part name="password">{$http_auth_password}</part>
+		</item>
+	</config>
+</gs_provision>
diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg
index ca14912733..970364074d 100644
--- a/resources/templates/provision/yealink/cp860/y000000000037.cfg
+++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg
@@ -994,23 +994,54 @@ phone_setting.backgrounds =  Config:yealink_cp860_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/cp920/y000000000078.cfg b/resources/templates/provision/yealink/cp920/y000000000078.cfg
index 99171fc770..1b988da65e 100644
--- a/resources/templates/provision/yealink/cp920/y000000000078.cfg
+++ b/resources/templates/provision/yealink/cp920/y000000000078.cfg
@@ -991,23 +991,54 @@ phone_setting.backgrounds =  Config:yealink_cp920_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/cp925/y000000000148.cfg b/resources/templates/provision/yealink/cp925/y000000000148.cfg
index 99171fc770..1b988da65e 100644
--- a/resources/templates/provision/yealink/cp925/y000000000148.cfg
+++ b/resources/templates/provision/yealink/cp925/y000000000148.cfg
@@ -991,23 +991,54 @@ phone_setting.backgrounds =  Config:yealink_cp920_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/cp960/y000000000073.cfg b/resources/templates/provision/yealink/cp960/y000000000073.cfg
index 34e4e21e3f..da540dba76 100644
--- a/resources/templates/provision/yealink/cp960/y000000000073.cfg
+++ b/resources/templates/provision/yealink/cp960/y000000000073.cfg
@@ -993,23 +993,54 @@ phone_setting.backgrounds =  Config:yealink_cp960_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/cp965/y000000000143.cfg b/resources/templates/provision/yealink/cp965/y000000000143.cfg
index 166244e02c..81e089351c 100644
--- a/resources/templates/provision/yealink/cp965/y000000000143.cfg
+++ b/resources/templates/provision/yealink/cp965/y000000000143.cfg
@@ -1416,34 +1416,54 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-##multicast.listen_address.X.label
+##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
-##multicast.listen_address.X.ip_address
+##multicast.listen_address.X.ip_address 
 ##multicast.paging_address.X.ip_address
 ##multicast.paging_address.X.label
 ##multicast.listen_address.X.channel
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                           Preference&Status                                       ##
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index 13e653b4f4..6d91512935 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -973,23 +973,54 @@ phone_setting.backgrounds =  Config:yealink_t21p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index b577f253f7..1eb3657b27 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -995,23 +995,54 @@ phone_setting.backgrounds =  Config:yealink_t23g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index 2a641f6b64..e739493964 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -994,23 +994,54 @@ phone_setting.backgrounds =  Config:yealink_t23p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t27g/y000000000069.cfg b/resources/templates/provision/yealink/t27g/y000000000069.cfg
index e20da27ce1..25d9a79260 100644
--- a/resources/templates/provision/yealink/t27g/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t27g/y000000000069.cfg
@@ -1022,23 +1022,54 @@ phone_setting.backgrounds =  Config:yealink_t27g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index 0290792877..aa949f73c0 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -995,23 +995,54 @@ phone_setting.backgrounds =  Config:yealink_t27p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg
index 47a62d0482..d862e0938c 100644
--- a/resources/templates/provision/yealink/t29g/y000000000046.cfg
+++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg
@@ -1025,23 +1025,54 @@ phone_setting.backgrounds =  Config:yealink_t29g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000044.cfg b/resources/templates/provision/yealink/t2x/y000000000044.cfg
index cb404b1fd4..d726b8f0db 100644
--- a/resources/templates/provision/yealink/t2x/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000044.cfg
@@ -995,23 +995,54 @@ phone_setting.backgrounds =  Config:yealink_t23g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000052.cfg b/resources/templates/provision/yealink/t2x/y000000000052.cfg
index c05c24cd1d..bc96b7113b 100644
--- a/resources/templates/provision/yealink/t2x/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000052.cfg
@@ -973,23 +973,54 @@ phone_setting.backgrounds =  Config:yealink_t21p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000069.cfg b/resources/templates/provision/yealink/t2x/y000000000069.cfg
index beb49cf88d..a74fd3a9d1 100644
--- a/resources/templates/provision/yealink/t2x/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000069.cfg
@@ -994,23 +994,54 @@ phone_setting.backgrounds =  Config:yealink_t27g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg
index b6ff40d1ac..bd32331e85 100644
--- a/resources/templates/provision/yealink/t33g/y000000000124.cfg
+++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg
@@ -1405,23 +1405,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                           Preference&Status                                       ##       
diff --git a/resources/templates/provision/yealink/t34w/y000000000171.cfg b/resources/templates/provision/yealink/t34w/y000000000171.cfg
index 36f97c653b..bad6f90653 100644
--- a/resources/templates/provision/yealink/t34w/y000000000171.cfg
+++ b/resources/templates/provision/yealink/t34w/y000000000171.cfg
@@ -1396,11 +1396,11 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-##multicast.listen_address.X.label
+##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
-##multicast.listen_address.X.ip_address
+##multicast.listen_address.X.ip_address 
 ##multicast.paging_address.X.ip_address
 ##multicast.paging_address.X.label
 ##multicast.listen_address.X.channel
@@ -1412,17 +1412,38 @@ multicast.codec =
 multicast.paging_address.1.channel =
 multicast.paging_address.1.label =
 multicast.paging_address.1.ip_address =
-multicast.receive_priority.enable =
-multicast.receive_priority.priority =
 
-multicast.receive.use_speaker =
-multicast.receive.enhance_volume =
-multicast.receive.ignore_dnd.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel =
-multicast.listen_address.1.label =
-multicast.listen_address.1.ip_address =
-multicast.listen_address.1.volume =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t40g/y000000000076.cfg b/resources/templates/provision/yealink/t40g/y000000000076.cfg
index 56d68a9a8e..b98b1f2c47 100644
--- a/resources/templates/provision/yealink/t40g/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t40g/y000000000076.cfg
@@ -997,23 +997,54 @@ phone_setting.backgrounds =  Config:yealink_t40g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t40p/y000000000054.cfg b/resources/templates/provision/yealink/t40p/y000000000054.cfg
index 369b86deff..3b28106b01 100644
--- a/resources/templates/provision/yealink/t40p/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t40p/y000000000054.cfg
@@ -996,23 +996,54 @@ phone_setting.backgrounds =  Config:yealink_t40p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index 08b9011db0..6c806ae80a 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -996,23 +996,55 @@ phone_setting.backgrounds =  Config:yealink_t41p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg
index b3e80066a7..2862ff4756 100644
--- a/resources/templates/provision/yealink/t41s/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg
@@ -1236,7 +1236,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1247,22 +1247,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index 1a5dfa2f66..3bea4a228a 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -995,23 +995,54 @@ phone_setting.backgrounds =  Config:yealink_t42g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t42u/y000000000116.cfg b/resources/templates/provision/yealink/t42u/y000000000116.cfg
index 70fc652d00..c6a09572ee 100644
--- a/resources/templates/provision/yealink/t42u/y000000000116.cfg
+++ b/resources/templates/provision/yealink/t42u/y000000000116.cfg
@@ -996,23 +996,54 @@ phone_setting.backgrounds =  Config:yealink_t42g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t44w/y000000000174.cfg b/resources/templates/provision/yealink/t44w/y000000000174.cfg
index aca11c86ea..3b86ac782b 100644
--- a/resources/templates/provision/yealink/t44w/y000000000174.cfg
+++ b/resources/templates/provision/yealink/t44w/y000000000174.cfg
@@ -1396,11 +1396,11 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-##multicast.listen_address.X.label
+##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
-##multicast.listen_address.X.ip_address
+##multicast.listen_address.X.ip_address 
 ##multicast.paging_address.X.ip_address
 ##multicast.paging_address.X.label
 ##multicast.listen_address.X.channel
@@ -1412,17 +1412,38 @@ multicast.codec =
 multicast.paging_address.1.channel =
 multicast.paging_address.1.label =
 multicast.paging_address.1.ip_address =
-multicast.receive_priority.enable =
-multicast.receive_priority.priority =
 
-multicast.receive.use_speaker =
-multicast.receive.enhance_volume =
-multicast.receive.ignore_dnd.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel =
-multicast.listen_address.1.label =
-multicast.listen_address.1.ip_address =
-multicast.listen_address.1.volume =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index 4e4f865042..dbd99e8694 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -1027,23 +1027,54 @@ phone_setting.backgrounds =  Config:yealink_t46g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg
index 034aad153b..56e9b72bee 100644
--- a/resources/templates/provision/yealink/t46u/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg
@@ -1390,7 +1390,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1401,22 +1401,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 8ccf394132..63fcb73965 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -1020,23 +1020,54 @@ phone_setting.backgrounds =  Config:yealink_t48g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg
index b77bf1bcd6..2b78c228a6 100644
--- a/resources/templates/provision/yealink/t48u/y000000000109.cfg
+++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg
@@ -1393,9 +1393,8 @@ local_time.ntp_server2 = {$ntp_server_secondary}
 local_time.time_zone = {$yealink_time_zone}
 local_time.time_zone_name = {$yealink_time_zone_name}
 
-
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1406,22 +1405,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index b560691537..71431e69ae 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -954,23 +954,54 @@ phone_setting.backgrounds =  Config:yealink_t49g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000028.cfg b/resources/templates/provision/yealink/t4x/y000000000028.cfg
index 301242d5a1..36d8d9a6e9 100644
--- a/resources/templates/provision/yealink/t4x/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000028.cfg
@@ -994,23 +994,54 @@ phone_setting.backgrounds =  Config:yealink_t46g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000029.cfg b/resources/templates/provision/yealink/t4x/y000000000029.cfg
index ec2a016907..9df0b12e6e 100644
--- a/resources/templates/provision/yealink/t4x/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000029.cfg
@@ -995,23 +995,54 @@ phone_setting.backgrounds =  Config:yealink_t42g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000035.cfg b/resources/templates/provision/yealink/t4x/y000000000035.cfg
index 95c93131fa..72b542ad8b 100644
--- a/resources/templates/provision/yealink/t4x/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000035.cfg
@@ -994,23 +994,54 @@ phone_setting.backgrounds =  Config:yealink_t48g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000036.cfg b/resources/templates/provision/yealink/t4x/y000000000036.cfg
index 9c5f776b91..d2c8e09d93 100644
--- a/resources/templates/provision/yealink/t4x/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000036.cfg
@@ -996,23 +996,54 @@ phone_setting.backgrounds =  Config:yealink_t41p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000054.cfg b/resources/templates/provision/yealink/t4x/y000000000054.cfg
index 3eeb2cf560..f2bd6f352d 100644
--- a/resources/templates/provision/yealink/t4x/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000054.cfg
@@ -996,23 +996,54 @@ phone_setting.backgrounds =  Config:yealink_t40p_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000065.cfg b/resources/templates/provision/yealink/t4x/y000000000065.cfg
index c4e6b62833..0dbd98145b 100644
--- a/resources/templates/provision/yealink/t4x/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000065.cfg
@@ -1285,7 +1285,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1296,22 +1296,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t4x/y000000000066.cfg b/resources/templates/provision/yealink/t4x/y000000000066.cfg
index 1826b1c386..b0f7ce3aee 100644
--- a/resources/templates/provision/yealink/t4x/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000066.cfg
@@ -1235,7 +1235,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1246,22 +1246,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t4x/y000000000067.cfg b/resources/templates/provision/yealink/t4x/y000000000067.cfg
index f938df5940..6e8780fdf8 100644
--- a/resources/templates/provision/yealink/t4x/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000067.cfg
@@ -1234,7 +1234,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1245,22 +1245,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t4x/y000000000068.cfg b/resources/templates/provision/yealink/t4x/y000000000068.cfg
index 23e032acfc..75cdb3c586 100644
--- a/resources/templates/provision/yealink/t4x/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000068.cfg
@@ -1236,7 +1236,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1247,22 +1247,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t4x/y000000000076.cfg b/resources/templates/provision/yealink/t4x/y000000000076.cfg
index 0caf251d25..d9a44d3c7e 100644
--- a/resources/templates/provision/yealink/t4x/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000076.cfg
@@ -996,23 +996,54 @@ phone_setting.backgrounds =  Config:yealink_t40g_wallpaper.png
 {/if}
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
-#Configure the codec of multicast paging.
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
 multicast.codec =
 
-#Enbale or diable the phone to handle the incoming multicast paging calls when there is a multicast paging call on the phone; 0-Disabled, 1-Enabled (default);
-#If enabled, the phone will answer the incoming multicast paging call with a higher priority and ignore that with a lower priority.
-multicast.receive_priority.enable =
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-#Configure the priority of multicast paging calls. It ranges from 0 to 10.
-multicast.receive_priority.priority =
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-#Configure the lable displayed on the LCD screen when receiving the multicast paging. X ranges from 1 to 10.
-multicast.listen_address.X.label =
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
 
-#Configure the listening multicast IP address and port number for the phone. X ranges from 1 to 10.
-multicast.listen_address.X.ip_address =
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000107.cfg b/resources/templates/provision/yealink/t4x/y000000000107.cfg
index e077596d7c..a85b898cad 100644
--- a/resources/templates/provision/yealink/t4x/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000107.cfg
@@ -1285,7 +1285,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1296,22 +1296,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t4x/y000000000108.cfg b/resources/templates/provision/yealink/t4x/y000000000108.cfg
index b13d883e07..21d535a592 100644
--- a/resources/templates/provision/yealink/t4x/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000108.cfg
@@ -1235,7 +1235,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1246,22 +1246,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t4x/y000000000109.cfg b/resources/templates/provision/yealink/t4x/y000000000109.cfg
index e077596d7c..a85b898cad 100644
--- a/resources/templates/provision/yealink/t4x/y000000000109.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000109.cfg
@@ -1285,7 +1285,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1296,22 +1296,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t4x/y000000000116.cfg b/resources/templates/provision/yealink/t4x/y000000000116.cfg
index f938df5940..6e8780fdf8 100644
--- a/resources/templates/provision/yealink/t4x/y000000000116.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000116.cfg
@@ -1234,7 +1234,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1245,22 +1245,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg
index fce98cc5a4..212066fde5 100644
--- a/resources/templates/provision/yealink/t52s/y000000000074.cfg
+++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg
@@ -1234,7 +1234,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1245,22 +1245,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg
index 5c0056c794..9e8d6c0898 100644
--- a/resources/templates/provision/yealink/t53/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53/y000000000095.cfg
@@ -1390,22 +1390,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg
index bd6dfe7994..8de973caab 100644
--- a/resources/templates/provision/yealink/t53w/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg
@@ -1390,22 +1390,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg
index ad6dca3e7f..26daf869c7 100644
--- a/resources/templates/provision/yealink/t54s/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg
@@ -1232,7 +1232,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1243,22 +1243,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t56a/y000000000056.cfg b/resources/templates/provision/yealink/t56a/y000000000056.cfg
index 54feba587d..b4370cde62 100644
--- a/resources/templates/provision/yealink/t56a/y000000000056.cfg
+++ b/resources/templates/provision/yealink/t56a/y000000000056.cfg
@@ -958,23 +958,54 @@ phone_setting.emergency.number = {$yealink_emergency_number}
 
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
 
-multicast.codec = 
-
-multicast.receive_priority.enable = 
-multicast.receive_priority.priority = 
-
-###X ranges from 1 to 10
-###multicast.listen_address.X.label = 
-###multicast.listen_address.X.ip_address = 
-
-multicast.listen_address.1.label = 
-multicast.listen_address.1.ip_address = 
+multicast.codec =
 
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
 multicast.paging_address.1.ip_address =
-multicast.paging_address.1.label = 
+
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
+
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index 7fcc0b6879..1298611792 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -1388,22 +1388,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t58a/y000000000058.cfg b/resources/templates/provision/yealink/t58a/y000000000058.cfg
index a0eae0e9da..a55d881d51 100644
--- a/resources/templates/provision/yealink/t58a/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58a/y000000000058.cfg
@@ -958,23 +958,54 @@ phone_setting.emergency.number = {$yealink_emergency_number}
 
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
 
-multicast.codec = 
-
-multicast.receive_priority.enable = 
-multicast.receive_priority.priority = 
-
-###X ranges from 1 to 10
-###multicast.listen_address.X.label = 
-###multicast.listen_address.X.ip_address = 
-
-multicast.listen_address.1.label = 
-multicast.listen_address.1.ip_address = 
+multicast.codec =
 
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
 multicast.paging_address.1.ip_address =
-multicast.paging_address.1.label = 
+
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
+
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg
index 5ff533eba8..d6f1d37cbb 100644
--- a/resources/templates/provision/yealink/t58v/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg
@@ -959,23 +959,54 @@ phone_setting.emergency.number = {$yealink_emergency_number}
 
 
 #######################################################################################
-##                                   Multicast                                       ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
 
-multicast.codec = 
-
-multicast.receive_priority.enable = 
-multicast.receive_priority.priority = 
-
-###X ranges from 1 to 10
-###multicast.listen_address.X.label = 
-###multicast.listen_address.X.ip_address = 
-
-multicast.listen_address.1.label = 
-multicast.listen_address.1.ip_address = 
+multicast.codec =
 
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
 multicast.paging_address.1.ip_address =
-multicast.paging_address.1.label = 
+
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
+
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg
index 9a9a25eaf6..c56b975696 100644
--- a/resources/templates/provision/yealink/t5x/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg
@@ -1231,7 +1231,7 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 
 
 #######################################################################################
-##                           Multicast Paging                                        ##
+##                           Multicast Paging                                        ##       
 #######################################################################################
 ##multicast.listen_address.X.label 
 ##multicast.paging_address.X.channel
@@ -1242,22 +1242,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg
index 20d0213fb8..9b3dc4b02d 100644
--- a/resources/templates/provision/yealink/t5x/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg
@@ -1383,22 +1383,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg
index e4881b8540..515cb9e14b 100644
--- a/resources/templates/provision/yealink/t5x/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg
@@ -1384,22 +1384,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg
index f5870954a0..0c4b7ba2ec 100644
--- a/resources/templates/provision/yealink/t5x/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg
@@ -1384,22 +1384,43 @@ local_time.time_zone_name = {$yealink_time_zone_name}
 ##multicast.listen_address.X.volume
 ##Multicast(X ranges from 1 to 31.)
 
-multicast.codec=
+multicast.codec =
 
-multicast.paging_address.1.channel=
-multicast.paging_address.1.label=
-multicast.paging_address.1.ip_address=
-multicast.receive_priority.enable=
-multicast.receive_priority.priority=
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
+multicast.paging_address.1.ip_address =
 
-multicast.receive.use_speaker=
-multicast.receive.enhance_volume=
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
 
-multicast.listen_address.1.channel=
-multicast.listen_address.1.label=
-multicast.listen_address.1.ip_address=
-multicast.listen_address.1.volume=
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/vp59/y000000000091.cfg b/resources/templates/provision/yealink/vp59/y000000000091.cfg
index 52268dd9ee..3f8f57b541 100644
--- a/resources/templates/provision/yealink/vp59/y000000000091.cfg
+++ b/resources/templates/provision/yealink/vp59/y000000000091.cfg
@@ -866,25 +866,54 @@ phone_setting.phone_lock.lock_time_out =
 phone_setting.emergency.number = 
 
 #######################################################################################
-##                                   Multicast                                       ##       
+##                           Multicast Paging                                        ##       
 #######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
 
-multicast.codec = 
-
-multicast.receive_priority.enable = 
-multicast.receive_priority.priority = 
-
-###X ranges from 1 to 31
-###multicast.listen_address.X.label = 
-###multicast.listen_address.X.ip_address = 
-
-multicast.listen_address.1.label = 
-multicast.listen_address.1.ip_address = 
+multicast.codec =
 
+multicast.paging_address.1.channel =
+multicast.paging_address.1.label =
 multicast.paging_address.1.ip_address =
-multicast.paging_address.1.label = 
 
-multicast.receive.ignore_dnd.priority=
+multicast.receive_priority.enable = {$yealink_multicast_receive_priority_enable}
+multicast.receive_priority.priority = {$yealink_multicast_receive_priority_priority}
+
+multicast.receive.use_speaker = {$yealink_multicast_receive_use_speaker}
+multicast.receive.enhance_volume = {$yealink_multicast_receive_enhance_volume}
+multicast.receive.ignore_dnd.priority = {$yealink_multicast_receive_ignore_dnd_priority}
+
+multicast.listen_address.1.channel  = {$yealink_multicast_listen_address_1_channel}
+multicast.listen_address.1.label = {$yealink_multicast_listen_address_1_label}
+multicast.listen_address.1.ip_address = {$yealink_multicast_listen_address_1_ip_address}
+multicast.listen_address.1.volume = {$yealink_multicast_listen_address_1_volume}
+
+multicast.listen_address.2.channel  = {$yealink_multicast_listen_address_2_channel}
+multicast.listen_address.2.label = {$yealink_multicast_listen_address_2_label}
+multicast.listen_address.2.ip_address = {$yealink_multicast_listen_address_2_ip_address}
+multicast.listen_address.2.volume = {$yealink_multicast_listen_address_2_volume}
+
+multicast.listen_address.3.channel  = {$yealink_multicast_listen_address_3_channel}
+multicast.listen_address.3.label = {$yealink_multicast_listen_address_3_label}
+multicast.listen_address.3.ip_address = {$yealink_multicast_listen_address_3_ip_address}
+multicast.listen_address.3.volume = {$yealink_multicast_listen_address_3_volume}
+
+multicast.listen_address.4.channel  = {$yealink_multicast_listen_address_4_channel}
+multicast.listen_address.4.label = {$yealink_multicast_listen_address_4_label}
+multicast.listen_address.4.ip_address = {$yealink_multicast_listen_address_4_ip_address}
+multicast.listen_address.4.volume = {$yealink_multicast_listen_address_4_volume}
+
+multicast.listen_address.5.channel  = {$yealink_multicast_listen_address_5_channel}
+multicast.listen_address.5.label = {$yealink_multicast_listen_address_5_label}
+multicast.listen_address.5.ip_address = {$yealink_multicast_listen_address_5_ip_address}
+multicast.listen_address.5.volume = {$yealink_multicast_listen_address_5_volume}
 
 #######################################################################################
 ##                                   Super Search									 ##       
diff --git a/themes/default/css.php b/themes/default/css.php
index 0be2dc295c..24a1760404 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -3259,7 +3259,9 @@ else { //default: white
 
 	div.action_bar > div.actions {
 		float: right;
-		white-space: nowrap;
+		white-space: normal;
+		overflow-wrap: break-word;
+		overflow: hidden;
 		}
 
 	div.action_bar > div.actions > div.unsaved {