diff --git a/DeviceTest/DeviceTestDlg.cs b/DeviceTest/DeviceTestDlg.cs
index 1e7b39931..423678ba9 100644
--- a/DeviceTest/DeviceTestDlg.cs
+++ b/DeviceTest/DeviceTestDlg.cs
@@ -645,7 +645,8 @@ namespace DeviceTest
 								MessageBoxIcon.Exclamation);
 
 				foreach (var dev in tbfDevices) dev.StopDevice();
-				tbfDevices.Clear();
+                foreach (var dev in tbfDevices) dev.StopDevice2();
+                tbfDevices.Clear();
 
 				startButton.Enabled = true;
 				stopButton.Enabled = false;
@@ -856,7 +857,8 @@ namespace DeviceTest
 			}
 
 			foreach (var d in tbfDevices) d.StopDevice();
-		}
+            foreach (var d in tbfDevices) d.StopDevice2();
+        }
 
 		private void stopButton_Click(object sender, EventArgs e)
 		{
diff --git a/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs b/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
index 311b9122a..220105e19 100644
--- a/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
+++ b/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
@@ -38,10 +38,9 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 		}
 
 
-		const string ClpUserName = "tbf";
+		string ClpUserName = string.Empty;          /// Either "tbf" or "pi" after a successful detection
 		const string ClpPassword = "C1ern4V0d4";
 
-
         private static Object fileUploadLock = new Object();  
 
 
@@ -184,6 +183,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 			{
                 UiBridge.Bridge.OnCameraInfo(this.cameraIdx, string.Format("{0}  ver.{1}  {2}  s/n {3}", Name, sdCardVer, ipAddress, CameraCfg.HardwareAddress));
 
+                ClpUserName = (sdCardVer[0] == '1') ? "tbf" : "pi";
+
                 rtpUdpLocalPort = UdpPortBase + 4 * cameraIdx;
                 rtcpUdpLocalPort = UdpPortBase + 4 * cameraIdx + 1;
                 msrmntUdpLocalPort = UdpPortBase + 4 * cameraIdx + 2;
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 8a02a27a8..69bf52919 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.26.1524.0")]
-[assembly: AssemblyFileVersion("2.26.1524.0")]
+[assembly: AssemblyVersion("2.26.1525.0")]
+[assembly: AssemblyFileVersion("2.26.1525.0")]