Index: /branches/rel_apv_10_7/usr/click/bin/ha_domain/domain.c
===================================================================
--- /branches/rel_apv_10_7/usr/click/bin/ha_domain/domain.c	(revision 38398)
+++ /branches/rel_apv_10_7/usr/click/bin/ha_domain/domain.c	(working copy)
@@ -350,7 +350,8 @@
 		output = NULL;
 	}
 
-	sprintf(cmds[0], "@synconfig from %s\n", unit_table[uid].name);
+	// Add ' \\\" ' to ensure the CLI Command
+	sprintf(cmds[0], "@synconfig from \\\"%s\\\"\n", unit_table[uid].name);
 	ret = do_cli_dependence_output(cmds);
 	if (ret) {
 		return ret;
@@ -2619,7 +2620,7 @@
 	cid = PEERUNIT_START_ID + index - 1;
 
 	/* update peer unit condition status */
-	/* TBD !!! ÐèÒªÁ¬Ðø¶à´ÎÊÕµ½heartbeat ²ÅÄÜUP */
+	/* TBD !!! ��Ҫ��������յ�heartbeat ����UP */
 	if(cond_table[cid].curr_status != HA_CEVENT_UP) {
 		handle_local_condition_state_change(LOCAL_UNIT, cid, HA_CEVENT_UP);
 	}
Index: /branches/rel_apv_10_7/usr/click/bin/sync/remote
===================================================================
--- /branches/rel_apv_10_7/usr/click/bin/sync/remote	(revision 38398)
+++ /branches/rel_apv_10_7/usr/click/bin/sync/remote	(working copy)
@@ -253,18 +253,36 @@
 
 					if [ "$2" = "from" ]
 					then
-						#take the snap shot from the current
-						#config instead of a running config for
-						#the "sync config from", this allows
-						#the from to work even when the source 
-						#is in config mode.
-						#sync from is a pull configuration operation.
+                        #take the snap shot from the current
+                        #config instead of a running config for
+                        #the "sync config from", this allows
+                        #the from to work even when the source 
+                        #is in config mode.
+                        #sync from is a pull configuration operation.
                         if [ "$7" != "YES" ]
                         then
+
+                          # Make another copy of the certificate from ca/conf
+                          # Certificate from ca/conf will be copy from var/run, only if user do "save configuration"
+                          /ca/sync/munch -x "cp -f /ca/conf/webui_server.pem /ca/conf/webui_server_backup.pem"
+
                           #IMPORTANT: (kkhauv 08/29/2014) Caller of this script must pass 'NO' to allow '/ca/sync/sync' below to run on non-FIPS system.
                           # On FIPS system, which $7='YES' passed in from caller, this '/ca/sync/sync' call below is deferred and will be called in call function in 'sync_ui.c' file instead.
-                           echo "sync config for $dst_ip starts..."
-							/ca/sync/sync $dst_ip $2 "" $6 $9 $segment_name $segment_user > /ca/sync/log/$dst_ip.log		
+                          echo "sync config for $dst_ip starts..."
+                          /ca/sync/sync $dst_ip $2 "" $6 $9 $segment_name $segment_user > /ca/sync/log/$dst_ip.log		
+
+                          # After sync, it will perform 2 action : clear config, and save config
+                          # Clear config, cause var/run/webui_server.pem to be change to default
+                          # Save config,  cause var/run/webui_server.pem to be saved to ca/conf
+                          # This action cause the uploaded certificate to be change to default both in var/run and ca/conf
+
+                          # The solution below is done by using 'the certificate that is copy on ca/conf'
+                          # and replace it both on 'var/run' and 'ca/conf'
+                          /ca/sync/munch -x "cp -f /ca/conf/webui_server_backup.pem /ca/conf/webui_server.pem"
+                          /ca/sync/munch -x "mv -f /ca/conf/webui_server_backup.pem /var/run/webui_server.pem"
+                          /ca/sync/munch -l 'webui off' -f "config"
+                          /ca/sync/munch -l 'webui on' -f "config"
+
 						else
 	   				      #For FIPS case, need to create a one-line file for '/ca/sync/log/from' so that it passes the existence/read check in 'sync_ui.c' for 'sync from' case.
 							echo " " >> /ca/sync/log/from