diff --git a/adapters/adtran_generic/common.php b/adapters/adtran_generic/common.php
index 5439dc56..f2d7798f 100644
--- a/adapters/adtran_generic/common.php
+++ b/adapters/adtran_generic/common.php
@@ -282,8 +282,9 @@ function scp_from_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = adtran_generic_connect();
   if ($ret !== SMS_OK)
@@ -361,8 +362,9 @@ function scp_to_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = adtran_generic_connect();
 
diff --git a/adapters/arista_eos/common.php b/adapters/arista_eos/common.php
index bddbf6f0..9abfae88 100644
--- a/adapters/arista_eos/common.php
+++ b/adapters/arista_eos/common.php
@@ -171,9 +171,9 @@ function scp_to_router($src, $dst)
 	$sd_ip_addr = $sd->SD_IP_CONFIG;
 	$login = $sd->SD_LOGIN_ENTRY;
 	$passwd = $sd->SD_PASSWD_ENTRY;
-	$mgt_port=$sd->SD_MANAGEMENT_PORT;
+	$sd_mgt_port=$sd->SD_MANAGEMENT_PORT;
 
-	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $mgt_port", $output);
+	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
 	sd_connect();
 
diff --git a/adapters/brocade_vyatta/device_configuration.php b/adapters/brocade_vyatta/device_configuration.php
index 40038f01..731b0a0e 100644
--- a/adapters/brocade_vyatta/device_configuration.php
+++ b/adapters/brocade_vyatta/device_configuration.php
@@ -193,7 +193,9 @@ function restore_conf()
       $login = $this->sd->SD_LOGIN_ENTRY;
       $passwd = $this->sd->SD_PASSWD_ENTRY;
       $ip_addr = $this->sd->SD_IP_CONFIG;
-      $cmd = "/opt/sms/bin/sms_scp_transfer -s $full_name -d /tmp/$file_name  -l '$login' -a $ip_addr -p '$passwd'";
+      $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
+
+      $cmd = "/opt/sms/bin/sms_scp_transfer -s $full_name -d /tmp/$file_name  -l '$login' -a $ip_addr -p '$passwd -P $sd_mgt_port'";
       exec_local(__FILE__ . ':' . __LINE__, $cmd, $output_array);
 
       if ($ret === SMS_OK)
diff --git a/adapters/catalyst_ios/common.php b/adapters/catalyst_ios/common.php
index 030368ed..154710ee 100644
--- a/adapters/catalyst_ios/common.php
+++ b/adapters/catalyst_ios/common.php
@@ -176,8 +176,9 @@ function scp_to_router($src, $dst)
 	$net_profile = get_network_profile();
 	$sd = &$net_profile->SD;
 	$sd_ip_addr = $sd->SD_IP_CONFIG;
+        $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
 	sd_connect();
 
diff --git a/adapters/cisco_asa_generic/device_common.php b/adapters/cisco_asa_generic/device_common.php
index 5a277754..3e1c6d97 100644
--- a/adapters/cisco_asa_generic/device_common.php
+++ b/adapters/cisco_asa_generic/device_common.php
@@ -167,8 +167,9 @@ function scp_to_router($src, $dst)
 	$net_profile = get_network_profile();
 	$sd = &$net_profile->SD;
 	$sd_ip_addr = $sd->SD_IP_CONFIG;
+        $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
 	device_connect();
 
@@ -515,4 +516,4 @@ function func_write()
   return SMS_OK;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/cisco_asa_rest/common.php b/adapters/cisco_asa_rest/common.php
index 14d0cd7c..8a7fde31 100644
--- a/adapters/cisco_asa_rest/common.php
+++ b/adapters/cisco_asa_rest/common.php
@@ -262,8 +262,9 @@ function scp_from_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = cisco_asa_rest_connect();
   if ($ret !== SMS_OK)
@@ -332,8 +333,9 @@ function scp_to_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = cisco_asa_rest_connect();
 
diff --git a/adapters/cisco_ios_xr/common.php b/adapters/cisco_ios_xr/common.php
index fcdbc4fc..277a3d76 100644
--- a/adapters/cisco_ios_xr/common.php
+++ b/adapters/cisco_ios_xr/common.php
@@ -138,8 +138,9 @@ function scp_from_router($src, $dst)
   $sd_ip_addr = $sd->SD_IP_CONFIG;
   $login      = $sd->SD_LOGIN_ENTRY;
   $passwd     = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   sleep(1); // to let the device finish scp execution
 
diff --git a/adapters/cisco_isr/common.php b/adapters/cisco_isr/common.php
index 77c5fc08..551f51a6 100644
--- a/adapters/cisco_isr/common.php
+++ b/adapters/cisco_isr/common.php
@@ -282,8 +282,9 @@ function scp_from_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_por", $output);
 
   $ret = cisco_isr_connect();
   if ($ret !== SMS_OK)
diff --git a/adapters/cisco_nexus9000/common.php b/adapters/cisco_nexus9000/common.php
index ebcfdd3d..52008cb0 100644
--- a/adapters/cisco_nexus9000/common.php
+++ b/adapters/cisco_nexus9000/common.php
@@ -282,8 +282,9 @@ function scp_from_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = cisco_nexus9000_connect();
   if ($ret !== SMS_OK)
@@ -361,8 +362,9 @@ function scp_to_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = cisco_nexus9000_connect();
 
diff --git a/adapters/cisco_nx_rest/common.php b/adapters/cisco_nx_rest/common.php
index 8efb692a..60852f25 100755
--- a/adapters/cisco_nx_rest/common.php
+++ b/adapters/cisco_nx_rest/common.php
@@ -136,8 +136,9 @@ function scp_to_router($src, $dst)
   $sd_ip_addr = $sd->SD_IP_CONFIG;
   $login = $sd->SD_LOGIN_ENTRY;
   $passwd = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = me_cli_connect();
 
diff --git a/adapters/citrix_adc/citrix_adc_apply_restore_conf.php b/adapters/citrix_adc/citrix_adc_apply_restore_conf.php
index be39ca83..3cffadc0 100755
--- a/adapters/citrix_adc/citrix_adc_apply_restore_conf.php
+++ b/adapters/citrix_adc/citrix_adc_apply_restore_conf.php
@@ -81,9 +81,10 @@ function citrix_netscalar_apply_restore_conf($configuration)
     file_put_contents($src, $str);
     
     $dst = "/nsconfig/config-from-msa.cfg";
+    $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
     
     
-    $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd", $output);
+    $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port", $output);
     unlink($local_file_name);
     
     
@@ -148,4 +149,4 @@ function citrix_netscalar_apply_restore_conf($configuration)
     // sleep(70);
     return SMS_OK;
 }
-?>
\ No newline at end of file
+?>
diff --git a/adapters/citrix_adc/citrix_adc_configuration.php b/adapters/citrix_adc/citrix_adc_configuration.php
index ff12bebd..b849a298 100755
--- a/adapters/citrix_adc/citrix_adc_configuration.php
+++ b/adapters/citrix_adc/citrix_adc_configuration.php
@@ -150,9 +150,11 @@ function update_firmware($param = '')
     $ipaddr = $sms_sd_ctx->getIpAddress();
     $login = $sms_sd_ctx->getLogin();
 
+    $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
+
     try
     {
-      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $SD->SD_PASSWD_ENTRY", $output);
+      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $SD->SD_PASSWD_ENTRY -P $sd_mgt_port", $output);
     }
     catch (Exception | Error $e)
     {
@@ -437,4 +439,4 @@ function update_license()
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/citrix_adc/common.php b/adapters/citrix_adc/common.php
index 0b5d2e46..ff0a6ad4 100755
--- a/adapters/citrix_adc/common.php
+++ b/adapters/citrix_adc/common.php
@@ -194,8 +194,9 @@ function scp_to_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = citrix_netscalar_connect();
 
@@ -544,4 +545,4 @@ function func_write()
   return SMS_OK;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/docker_generic/common.php b/adapters/docker_generic/common.php
index e16939dc..032caec6 100644
--- a/adapters/docker_generic/common.php
+++ b/adapters/docker_generic/common.php
@@ -86,8 +86,9 @@ function scp_from_router($src, $dst)
 
   $login = $sd->SD_LOGIN_ENTRY;
   $passwd = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' ", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' -P $sd_mgt_port ", $output);
 
   $ret = me_connect();
   if ($ret !== SMS_OK)
@@ -146,8 +147,9 @@ function scp_to_router($src, $dst)
   $sd_ip_addr = $sd->SD_IP_CONFIG;
   $login = $sd->SD_LOGIN_ENTRY;
   $passwd = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk/$dst -l $login -a $sd_ip_addr -p '$passwd' ", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk/$dst -l $login -a $sd_ip_addr -p '$passwd' -P $sd_mgt_port", $output);
 
   $ret = me_connect();
 
@@ -216,4 +218,4 @@ function check_file_size($local_file, $remote_file, $remove_remote_file = false)
   return SMS_OK;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/esa/esa_apply_conf.php b/adapters/esa/esa_apply_conf.php
index 29b38008..c23c4e88 100644
--- a/adapters/esa/esa_apply_conf.php
+++ b/adapters/esa/esa_apply_conf.php
@@ -95,8 +95,9 @@ function esa_apply_conf($configuration)
 
   $src = $local_file_name;
   $dst = "/configuration/config.xml";
+  $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $ipaddr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port", $output);
   unlink($local_file_name);
 
   if ($ret_scp !== SMS_OK)
@@ -215,4 +216,4 @@ function update_password($sms_sd_ctx, $old_passwd, $new_password)
   $sms_sd_ctx->sendexpectone(__FILE__ . ':' . __LINE__, $new_password);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/esa/esa_configuration.php b/adapters/esa/esa_configuration.php
index 09980d72..9b3cc52c 100644
--- a/adapters/esa/esa_configuration.php
+++ b/adapters/esa/esa_configuration.php
@@ -117,9 +117,13 @@ function get_running_conf()
     $login = $sms_sd_ctx->getLogin();
     $passwd = $sms_sd_ctx->getPassword();
 
+    $network = get_network_profile();
+    $SD = &$network->SD;
+    $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
+
     try
     {
-      $ret = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -r", $output);
+      $ret = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port -r", $output);
       if ($ret != SMS_OK)
       {
         return '';
diff --git a/adapters/faere_generic/common.php b/adapters/faere_generic/common.php
index 9a9d62c9..bf298c18 100644
--- a/adapters/faere_generic/common.php
+++ b/adapters/faere_generic/common.php
@@ -32,11 +32,13 @@ function func_reboot($msg = '')
   	}
 }
 
-function send_file($source, $destination, $ip, $login, $password){
-	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $source -d $destination -l $login -a $ip -p '$password' -P 22", $output);
+function send_file($source, $destination, $ip, $login, $password, $sd_mgt_port ){
+ 
+
+	$ret_scp = exec_local(__FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -s $source -d $destination -l $login -a $ip -p '$password' -P $sd_mgt_port", $output);
 	if ($ret_scp !== SMS_OK){
 			return $ret_scp;
 	}
 	return SMS_OK;
 }
-?>
\ No newline at end of file
+?>
diff --git a/adapters/faere_generic/faere_generic_restore_configuration.php b/adapters/faere_generic/faere_generic_restore_configuration.php
index c737ea51..6352b93b 100644
--- a/adapters/faere_generic/faere_generic_restore_configuration.php
+++ b/adapters/faere_generic/faere_generic_restore_configuration.php
@@ -86,9 +86,10 @@ function restore_conf()
 	$login = $this->sd->SD_LOGIN_ENTRY;
 	$password = $this->sd->SD_PASSWD_ENTRY;
 	$device_ip = $this->sd->SD_IP_CONFIG;
+	$sd_mgt_port = $this->sd->SD_MANAGEMENT_PORT;
 	$source = $full_name;
 	$destination = '/etc/dreddA/tdsconfig.json';
-	$ret = send_file($source, $destination, $device_ip, $login, $password);
+	$ret = send_file($source, $destination, $device_ip, $login, $password, $sd_mgt_port);
     return $ret;
   }
 
@@ -100,4 +101,4 @@ function wait_until_device_is_up()
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/fujitsu_ipcom/common.php b/adapters/fujitsu_ipcom/common.php
index 6ef66c58..db2df23e 100755
--- a/adapters/fujitsu_ipcom/common.php
+++ b/adapters/fujitsu_ipcom/common.php
@@ -282,8 +282,9 @@ function scp_from_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = fujitsu_ipcom_connect();
   if ($ret !== SMS_OK)
@@ -361,8 +362,9 @@ function scp_to_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = fujitsu_ipcom_connect();
 
diff --git a/adapters/juniper_srx/common.php b/adapters/juniper_srx/common.php
index 5dc8fc34..0cd18978 100644
--- a/adapters/juniper_srx/common.php
+++ b/adapters/juniper_srx/common.php
@@ -71,8 +71,9 @@ function scp_to_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = juniper_srx_connect();
 
@@ -424,4 +425,4 @@ function func_write()
   return SMS_OK;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/juniper_srx/juniper_srx_apply_restore_conf.php b/adapters/juniper_srx/juniper_srx_apply_restore_conf.php
index a33e2dad..2f62bf2a 100644
--- a/adapters/juniper_srx/juniper_srx_apply_restore_conf.php
+++ b/adapters/juniper_srx/juniper_srx_apply_restore_conf.php
@@ -74,8 +74,9 @@ function juniper_srx_apply_restore_conf($configuration)
   
   $src = $local_file_name;
   $dst = "/config/config-from-msa.cfg";
-  
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd", $output);
+  $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
+ 
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port", $output);
   unlink($local_file_name);
   
   if ($ret_scp !== SMS_OK)
diff --git a/adapters/juniper_srx/juniper_srx_configuration.php b/adapters/juniper_srx/juniper_srx_configuration.php
index 2c6676d0..ce57ca34 100644
--- a/adapters/juniper_srx/juniper_srx_configuration.php
+++ b/adapters/juniper_srx/juniper_srx_configuration.php
@@ -149,10 +149,11 @@ function update_firmware($param = '')
 
     $ipaddr = $sms_sd_ctx->getIpAddress();
     $login = $sms_sd_ctx->getLogin();
+    $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
 
     try
     {
-      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $SD->SD_PASSWD_ENTRY", $output);
+      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $SD->SD_PASSWD_ENTRY -P $sd_mgt_port", $output);
     }
     catch (Exception | Error $e)
     {
@@ -408,10 +409,14 @@ function update_license()
     $ipaddr = $sms_sd_ctx->getIpAddress();
     $login = $sms_sd_ctx->getLogin();
     $passwd = $sms_sd_ctx->getPassword();
+    
+    $network= get_network_profile();
+    $SD = &$network->SD;
+    $sd_mgt_port = $SD->SD_MANAGEMENT_PORT; 
 
     try
     {
-      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd", $output);
+      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port", $output);
     }
     catch (Exception | Error $e)
     {
@@ -437,4 +442,4 @@ function update_license()
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/linux_generic/common.php b/adapters/linux_generic/common.php
index d5f6c023..4147e074 100644
--- a/adapters/linux_generic/common.php
+++ b/adapters/linux_generic/common.php
@@ -83,11 +83,11 @@ function scp_from_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
-
   $login = $sd->SD_LOGIN_ENTRY;
   $passwd = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' ", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' -P $sd_mgt_port", $output);
 
   $ret = linux_generic_connect();
   if ($ret !== SMS_OK)
@@ -146,8 +146,9 @@ function scp_to_router($src, $dst)
   $sd_ip_addr = $sd->SD_IP_CONFIG;
   $login = $sd->SD_LOGIN_ENTRY;
   $passwd = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' ", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' -P $sd_mgt_port ", $output);
 
   $ret = linux_generic_connect();
 
diff --git a/adapters/netconf_generic/common.php b/adapters/netconf_generic/common.php
index ee04a7a0..297d8537 100644
--- a/adapters/netconf_generic/common.php
+++ b/adapters/netconf_generic/common.php
@@ -72,8 +72,9 @@ function scp_to_router($src, $dst) {
 	$net_profile = get_network_profile ();
 	$sd = &$net_profile->SD;
 	$sd_ip_addr = $sd->SD_IP_CONFIG;
+        $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-	$ret_scp = exec_local ( __FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd", $output );
+	$ret_scp = exec_local ( __FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output );
 
 	$ret = netconf_generic_connect ();
 
@@ -366,4 +367,4 @@ function func_write() {
 	return SMS_OK;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/netconf_generic/netconf_generic_apply_restore_conf.php b/adapters/netconf_generic/netconf_generic_apply_restore_conf.php
index 1867b6cb..4682d6fb 100644
--- a/adapters/netconf_generic/netconf_generic_apply_restore_conf.php
+++ b/adapters/netconf_generic/netconf_generic_apply_restore_conf.php
@@ -66,8 +66,9 @@ function netconf_generic_apply_restore_conf($configuration) {
 	
 	$src = $local_file_name;
 	$dst = "/config/config-from-msa.cfg";
+	$sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
 	
-	$ret_scp = exec_local ( __FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -v 2 -s $src -d $dst -l $login -a $ipaddr -p $passwd", $output );
+	$ret_scp = exec_local ( __FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -v 2 -s $src -d $dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port", $output );
 	unlink ( $local_file_name );
 	
 	if ($ret_scp !== SMS_OK) {
diff --git a/adapters/netconf_generic/netconf_generic_configuration.php b/adapters/netconf_generic/netconf_generic_configuration.php
index b3a009ba..32379628 100644
--- a/adapters/netconf_generic/netconf_generic_configuration.php
+++ b/adapters/netconf_generic/netconf_generic_configuration.php
@@ -112,9 +112,10 @@ function update_firmware($param = '') {
 
 		$ipaddr = $sms_sd_ctx->getIpAddress ();
 		$login = $sms_sd_ctx->getLogin ();
+                $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
 
 		try {
-			$ret_scp = exec_local ( __FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -v 2 -s $src -d $dst -l $login -a $ipaddr -p $SD->SD_PASSWD_ENTRY", $output );
+			$ret_scp = exec_local ( __FILE__.':'.__LINE__, "/opt/sms/bin/sms_scp_transfer -v 2 -s $src -d $dst -l $login -a $ipaddr -p $SD->SD_PASSWD_ENTRY -P $sd_mgt_port", $output );
 		} catch ( Exception | Error $e ) {
 			return $e->getMessage ();
 		}
@@ -379,4 +380,4 @@ function update_license() {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/oneaccess_lbb/common.php b/adapters/oneaccess_lbb/common.php
index 7edc1ebe..53201991 100644
--- a/adapters/oneaccess_lbb/common.php
+++ b/adapters/oneaccess_lbb/common.php
@@ -270,6 +270,7 @@ function scp_to_router($src, $dst)
 	$sd_ip_addr = $sd->SD_IP_CONFIG;
 	$login = $sd->SD_LOGIN_ENTRY;
 	$passwd = $sd->SD_PASSWD_ENTRY;
+        $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
 	/* //rename filename with smaller size - to scp file name should be less than 40 characters.
 
@@ -281,7 +282,7 @@ function scp_to_router($src, $dst)
 		$ret_move = exec_local(__FILE__ . ':' . __LINE__, "mv $src_file ONEOS.ZZZ", $output);
 	} */
 
-	$ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p '$passwd'", $output);
+	$ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d /$dst -l $login -a $sd_ip_addr -p '$passwd' -P $sd_mgt_port", $output);
 
 	if ($ret_scp !== SMS_OK)
 	{
diff --git a/adapters/pfsense_fw/pfsense_fw_apply_conf.php b/adapters/pfsense_fw/pfsense_fw_apply_conf.php
index aca92771..8cdde437 100755
--- a/adapters/pfsense_fw/pfsense_fw_apply_conf.php
+++ b/adapters/pfsense_fw/pfsense_fw_apply_conf.php
@@ -98,7 +98,9 @@ function pfsense_fw_apply_conf($configuration)
 
   $src = $local_file_name;
   $dst = "/cf/conf/config.xml";
- $scp_cmd="/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l root -p '".$passwd."'  -a $ipaddr";
+  $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
+
+ $scp_cmd="/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l root -p '".$passwd."'  -a $ipaddr -P $sd_mgt_port";
   $ret_scp = exec_local(__FILE__ . ':' . __LINE__, $scp_cmd, $output);
   unlink($local_file_name);
 
diff --git a/adapters/terraform_generic/common.php b/adapters/terraform_generic/common.php
index 5d41a1ca..12060e52 100644
--- a/adapters/terraform_generic/common.php
+++ b/adapters/terraform_generic/common.php
@@ -95,8 +95,9 @@ function scp_from_router($src, $dst)
 
   $login = $sd->SD_LOGIN_ENTRY;
   $passwd = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' ", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p '$passwd' -P $sd_mgt_port", $output);
 
   $ret = terraform_generic_connect();
   if ($ret !== SMS_OK)
@@ -155,8 +156,9 @@ function scp_to_router($src, $dst)
   $sd_ip_addr = $sd->SD_IP_CONFIG;
   $login = $sd->SD_LOGIN_ENTRY;
   $passwd = $sd->SD_PASSWD_ENTRY;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk/$dst -l $login -a $sd_ip_addr -p '$passwd' ", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk/$dst -l $login -a $sd_ip_addr -p '$passwd' -P $sd_mgt_port", $output);
 
   $ret = terraform_generic_connect();
 
@@ -225,4 +227,4 @@ function check_file_size($local_file, $remote_file, $remove_remote_file = false)
   return SMS_OK;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/veex_rtu/common.php b/adapters/veex_rtu/common.php
index d60666cb..57383e28 100644
--- a/adapters/veex_rtu/common.php
+++ b/adapters/veex_rtu/common.php
@@ -282,8 +282,9 @@ function scp_from_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -r -s $src -d $dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = veex_rtu_connect();
   if ($ret !== SMS_OK)
@@ -361,8 +362,9 @@ function scp_to_router($src, $dst)
   $net_profile = get_network_profile();
   $sd = &$net_profile->SD;
   $sd_ip_addr = $sd->SD_IP_CONFIG;
+  $sd_mgt_port = $sd->SD_MANAGEMENT_PORT;
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd", $output);
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst_disk:/$dst -l $login -a $sd_ip_addr -p $passwd -P $sd_mgt_port", $output);
 
   $ret = veex_rtu_connect();
 
diff --git a/adapters/wsa/wsa_apply_conf.php b/adapters/wsa/wsa_apply_conf.php
index 7f4ebee6..353c8e5a 100644
--- a/adapters/wsa/wsa_apply_conf.php
+++ b/adapters/wsa/wsa_apply_conf.php
@@ -97,7 +97,9 @@ function wsa_apply_conf($configuration)
   $src = $local_file_name;
   $dst = "/configuration/config.xml";
 
-  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd", $output);
+  $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
+
+  $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port", $output);
   unlink($local_file_name);
 
   if ($ret_scp !== SMS_OK)
@@ -210,4 +212,4 @@ function update_password($sms_sd_ctx, $old_passwd, $new_password)
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/adapters/wsa/wsa_configuration.php b/adapters/wsa/wsa_configuration.php
index 59b49154..7f3198d9 100644
--- a/adapters/wsa/wsa_configuration.php
+++ b/adapters/wsa/wsa_configuration.php
@@ -162,9 +162,13 @@ function get_running_conf()
     $login = $sms_sd_ctx->getLogin();
     $passwd = $sms_sd_ctx->getPassword();
 
+    $network = get_network_profile();
+    $SD = &$network->SD;
+    $sd_mgt_port = $SD->SD_MANAGEMENT_PORT;
+
     try
     {
-      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -r", $output);
+      $ret_scp = exec_local(__FILE__ . ':' . __LINE__, "/opt/sms/bin/sms_scp_transfer -s $src -d $dst -l $login -a $ipaddr -p $passwd -P $sd_mgt_port -r", $output);
     }
     catch (Exception | Error $e)
     {