diff --git a/Host/Source/MicroBoot/interfaces/XcpLoader.pas b/Host/Source/MicroBoot/interfaces/XcpLoader.pas
index c250f3f8..b051b3a0 100644
--- a/Host/Source/MicroBoot/interfaces/XcpLoader.pas
+++ b/Host/Source/MicroBoot/interfaces/XcpLoader.pas
@@ -114,6 +114,7 @@ type
     FIsConnected     : Boolean;
     FTimerInterval   : array[1..7] of Word;
     FConnectCmdTimer : Word;
+    FConnectMode     : Byte;
     FIsIntel         : Boolean;
     FCtoPacketLen    : Byte;
     FCtoPGMPacketLen : Byte;
@@ -128,7 +129,7 @@ type
     procedure   SetOrderedLong(value: LongWord; data : PByteArray);
     function    SendSynchedPacket(timeMs : Word; useMta : Boolean) : Boolean;
     function    CmdSynch(useMta : Boolean) : Boolean;
-    function    CmdConnect : Boolean;
+    function    CmdConnect(mode: Byte) : Boolean;
     function    CmdDisconnect : Boolean;
     function    CmdProgramStart : Boolean;
     function    CmdGetStatus : Boolean;
@@ -202,6 +203,8 @@ begin
   // timeout is important for the OpenBLT timed backdoor feature. The backdoor time should
   // be at least 2.5 times the length of this timeout value.
   FConnectCmdTimer  :=  20;   // 20 ms - connect command
+  // set default connection mode
+  FConnectMode := 0;
 
   // create instance of XCP transport layer object
   comDriver := TXcpTransport.Create;
@@ -374,6 +377,7 @@ begin
     FTimerInterval[5] := settingsIni.ReadInteger('xcp', 't5', 1000);
     FTimerInterval[7] := settingsIni.ReadInteger('xcp', 't7', 2000);
     FConnectCmdTimer := settingsIni.ReadInteger('xcp', 'tconnect', 20);
+    FConnectMode := settingsIni.ReadInteger('xcp', 'connectmode', 0);
 
     // release ini file object
     settingsIni.Free;
@@ -553,19 +557,19 @@ end; //*** end of CmdSynch ***
 
 //***************************************************************************************
 // NAME:           CmdConnect
-// PARAMETER:      none
+// PARAMETER:      mode Connection mode.
 // RETURN VALUE:   True is successful, False otherwise
 // DESCRIPTION:    Connects the XCP slave to start the XCP session
 //
 //***************************************************************************************
-function TXcpLoader.CmdConnect : Boolean;
+function TXcpLoader.CmdConnect(mode: Byte) : Boolean;
 begin
   // init return value
   Result := false;
 
   // prepare the connect command packet
   comDriver.packetData[0] := kCmdCONNECT;
-  comDriver.packetData[1] := 0; // normal mode
+  comDriver.packetData[1] := mode; // normal mode
   comDriver.packetLen := 2;
 
   // send out the command with 20ms timeout. note that this timeout is not required at
@@ -1076,7 +1080,7 @@ end; //*** end of CmdProgramClear ***
 
 //***************************************************************************************
 // NAME:           StartProgrammingSession
-// PARAMETER:      none
+// PARAMETER:      none.
 // RETURN VALUE:   kProgSessionStarted if successful, kProgSessionUnlockError in case
 //                 the PGM resource could not be unlocked or kProgSessionGenericError.
 // DESCRIPTION:    Starts the programming session using the following XCP command
@@ -1098,7 +1102,7 @@ var
   keyLen        : byte;
 begin
   // send the CONNECT command
-  if not CmdConnect then
+  if not CmdConnect(FConnectMode) then
   begin
     result := kProgSessionGenericError;
     Exit;
diff --git a/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.dfm
index 5a8a5a05..1fae1ce1 100644
Binary files a/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.dfm and b/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.dfm differ
diff --git a/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.pas
index 8714a838..a1459d78 100644
--- a/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.pas
+++ b/Host/Source/MicroBoot/interfaces/can/kvaser/XcpSettings.pas
@@ -83,6 +83,11 @@ type
     edtTconnect: TEdit;
     lblTconnect: TLabel;
     cmbBaudrate: TComboBox;
+    tabSession: TTabSheet;
+    iconXcp3: TImage;
+    lblXcpSession: TLabel;
+    lblConnectMode: TLabel;
+    cmbConnectMode: TComboBox;
     procedure btnOKClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure btnBrowseClick(Sender: TObject);
@@ -414,13 +419,14 @@ begin
     FSettingsForm.edtReceiveId.Text := Format('%x',[settingsIni.ReadInteger('can', 'rxid', $7e1)]);
 
     // XCP related elements
-    FSettingsForm.edtSeedKey.Text := settingsIni.ReadString('xcp', 'seedkey', '');
+    FSettingsForm.edtSeedKey.Text := settingsIni.ReadString('xcp', 'seedkey', ExtractFilePath(ParamStr(0))+'');
     FSettingsForm.edtT1.Text := IntToStr(settingsIni.ReadInteger('xcp', 't1', 1000));
     FSettingsForm.edtT3.Text := IntToStr(settingsIni.ReadInteger('xcp', 't3', 2000));
     FSettingsForm.edtT4.Text := IntToStr(settingsIni.ReadInteger('xcp', 't4', 10000));
     FSettingsForm.edtT5.Text := IntToStr(settingsIni.ReadInteger('xcp', 't5', 1000));
     FSettingsForm.edtT7.Text := IntToStr(settingsIni.ReadInteger('xcp', 't7', 2000));
     FSettingsForm.edtTconnect.Text := IntToStr(settingsIni.ReadInteger('xcp', 'tconnect', 20));
+    FSettingsForm.cmbConnectMode.ItemIndex := settingsIni.ReadInteger('xcp', 'connectmode', 0);
 
     // release ini file object
     settingsIni.Free;
@@ -438,13 +444,14 @@ begin
     FSettingsForm.edtReceiveId.Text := Format('%x',[$7e1]);
 
     // XCP related elements
-    FSettingsForm.edtSeedKey.Text := '';
+    FSettingsForm.edtSeedKey.Text := ExtractFilePath(ParamStr(0))+'';
     FSettingsForm.edtT1.Text := IntToStr(1000);
     FSettingsForm.edtT3.Text := IntToStr(2000);
     FSettingsForm.edtT4.Text := IntToStr(10000);
     FSettingsForm.edtT5.Text := IntToStr(1000);
     FSettingsForm.edtT7.Text := IntToStr(2000);
     FSettingsForm.edtTconnect.Text := IntToStr(20);
+    FSettingsForm.cmbConnectMode.ItemIndex := 0;
   end;
 
   // show the form as modal so we can get the result here
@@ -471,6 +478,7 @@ begin
       settingsIni.WriteInteger('xcp', 't5', StrToInt(FSettingsForm.edtT5.Text));
       settingsIni.WriteInteger('xcp', 't7', StrToInt(FSettingsForm.edtT7.Text));
       settingsIni.WriteInteger('xcp', 'tconnect', StrToInt(FSettingsForm.edtTconnect.Text));
+      settingsIni.WriteInteger('xcp', 'connectmode', FSettingsForm.cmbConnectMode.ItemIndex);
 
       // release ini file object
       settingsIni.Free;
diff --git a/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.dfm
index 86c8c2b4..8c0a0c74 100644
Binary files a/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.dfm and b/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.dfm differ
diff --git a/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.pas
index 2b4ce334..95d3986f 100644
--- a/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.pas
+++ b/Host/Source/MicroBoot/interfaces/can/lawicel/XcpSettings.pas
@@ -83,6 +83,11 @@ type
     edtTconnect: TEdit;
     lblTconnect: TLabel;
     cmbBaudrate: TComboBox;
+    tabSession: TTabSheet;
+    iconXcp3: TImage;
+    lblXcpSession: TLabel;
+    lblConnectMode: TLabel;
+    cmbConnectMode: TComboBox;
     procedure btnOKClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure btnBrowseClick(Sender: TObject);
@@ -396,13 +401,14 @@ begin
     FSettingsForm.edtReceiveId.Text := Format('%x',[settingsIni.ReadInteger('can', 'rxid', $7e1)]);
 
     // XCP related elements
-    FSettingsForm.edtSeedKey.Text := settingsIni.ReadString('xcp', 'seedkey', '');
+    FSettingsForm.edtSeedKey.Text := settingsIni.ReadString('xcp', 'seedkey', ExtractFilePath(ParamStr(0))+'');
     FSettingsForm.edtT1.Text := IntToStr(settingsIni.ReadInteger('xcp', 't1', 1000));
     FSettingsForm.edtT3.Text := IntToStr(settingsIni.ReadInteger('xcp', 't3', 2000));
     FSettingsForm.edtT4.Text := IntToStr(settingsIni.ReadInteger('xcp', 't4', 10000));
     FSettingsForm.edtT5.Text := IntToStr(settingsIni.ReadInteger('xcp', 't5', 1000));
     FSettingsForm.edtT7.Text := IntToStr(settingsIni.ReadInteger('xcp', 't7', 2000));
     FSettingsForm.edtTconnect.Text := IntToStr(settingsIni.ReadInteger('xcp', 'tconnect', 20));
+    FSettingsForm.cmbConnectMode.ItemIndex := settingsIni.ReadInteger('xcp', 'connectmode', 0);
 
     // release ini file object
     settingsIni.Free;
@@ -420,13 +426,14 @@ begin
     FSettingsForm.edtReceiveId.Text := Format('%x',[$7e1]);
 
     // XCP related elements
-    FSettingsForm.edtSeedKey.Text := '';
+    FSettingsForm.edtSeedKey.Text := ExtractFilePath(ParamStr(0))+'';
     FSettingsForm.edtT1.Text := IntToStr(1000);
     FSettingsForm.edtT3.Text := IntToStr(2000);
     FSettingsForm.edtT4.Text := IntToStr(10000);
     FSettingsForm.edtT5.Text := IntToStr(1000);
     FSettingsForm.edtT7.Text := IntToStr(2000);
     FSettingsForm.edtTconnect.Text := IntToStr(20);
+    FSettingsForm.cmbConnectMode.ItemIndex := 0;
   end;
 
   // show the form as modal so we can get the result here
@@ -453,6 +460,7 @@ begin
       settingsIni.WriteInteger('xcp', 't5', StrToInt(FSettingsForm.edtT5.Text));
       settingsIni.WriteInteger('xcp', 't7', StrToInt(FSettingsForm.edtT7.Text));
       settingsIni.WriteInteger('xcp', 'tconnect', StrToInt(FSettingsForm.edtTconnect.Text));
+      settingsIni.WriteInteger('xcp', 'connectmode', FSettingsForm.cmbConnectMode.ItemIndex);
 
       // release ini file object
       settingsIni.Free;
diff --git a/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj b/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj
index 9bf27d80..786f7ce8 100644
--- a/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj
+++ b/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.1</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -70,7 +70,7 @@
         <DCC_Optimize>false</DCC_Optimize>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.1.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_MinorVer>1</VerInfo_MinorVer>
         <Debugger_HostApplication>C:\Work\software\OpenBLT\Host\MicroBoot.exe</Debugger_HostApplication>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
diff --git a/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.dfm
index 22d0b1cc..4c88fb1b 100644
Binary files a/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.dfm and b/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.dfm differ
diff --git a/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.pas
index 7e312609..6a8729a7 100644
--- a/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.pas
+++ b/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.pas
@@ -83,6 +83,11 @@ type
     edtTconnect: TEdit;
     lblTconnect: TLabel;
     cmbBaudrate: TComboBox;
+    tabSession: TTabSheet;
+    iconXcp3: TImage;
+    lblXcpSession: TLabel;
+    lblConnectMode: TLabel;
+    cmbConnectMode: TComboBox;
     procedure btnOKClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure btnBrowseClick(Sender: TObject);
@@ -418,13 +423,14 @@ begin
     FSettingsForm.edtReceiveId.Text := Format('%x',[settingsIni.ReadInteger('can', 'rxid', $7e1)]);
 
     // XCP related elements
-    FSettingsForm.edtSeedKey.Text := settingsIni.ReadString('xcp', 'seedkey', '');
+    FSettingsForm.edtSeedKey.Text := settingsIni.ReadString('xcp', 'seedkey', ExtractFilePath(ParamStr(0))+'');
     FSettingsForm.edtT1.Text := IntToStr(settingsIni.ReadInteger('xcp', 't1', 1000));
     FSettingsForm.edtT3.Text := IntToStr(settingsIni.ReadInteger('xcp', 't3', 2000));
     FSettingsForm.edtT4.Text := IntToStr(settingsIni.ReadInteger('xcp', 't4', 10000));
     FSettingsForm.edtT5.Text := IntToStr(settingsIni.ReadInteger('xcp', 't5', 1000));
     FSettingsForm.edtT7.Text := IntToStr(settingsIni.ReadInteger('xcp', 't7', 2000));
     FSettingsForm.edtTconnect.Text := IntToStr(settingsIni.ReadInteger('xcp', 'tconnect', 20));
+    FSettingsForm.cmbConnectMode.ItemIndex := settingsIni.ReadInteger('xcp', 'connectmode', 0);
 
     // release ini file object
     settingsIni.Free;
@@ -442,13 +448,14 @@ begin
     FSettingsForm.edtReceiveId.Text := Format('%x',[$7e1]);
 
     // XCP related elements
-    FSettingsForm.edtSeedKey.Text := '';
+    FSettingsForm.edtSeedKey.Text := ExtractFilePath(ParamStr(0))+'';
     FSettingsForm.edtT1.Text := IntToStr(1000);
     FSettingsForm.edtT3.Text := IntToStr(2000);
     FSettingsForm.edtT4.Text := IntToStr(10000);
     FSettingsForm.edtT5.Text := IntToStr(1000);
     FSettingsForm.edtT7.Text := IntToStr(2000);
     FSettingsForm.edtTconnect.Text := IntToStr(20);
+    FSettingsForm.cmbConnectMode.ItemIndex := 0;
   end;
 
   // show the form as modal so we can get the result here
@@ -475,6 +482,7 @@ begin
       settingsIni.WriteInteger('xcp', 't5', StrToInt(FSettingsForm.edtT5.Text));
       settingsIni.WriteInteger('xcp', 't7', StrToInt(FSettingsForm.edtT7.Text));
       settingsIni.WriteInteger('xcp', 'tconnect', StrToInt(FSettingsForm.edtTconnect.Text));
+      settingsIni.WriteInteger('xcp', 'connectmode', FSettingsForm.cmbConnectMode.ItemIndex);
 
       // release ini file object
       settingsIni.Free;
diff --git a/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj
index 76da7a50..2f51eb84 100644
--- a/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj
+++ b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.1</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -70,7 +70,7 @@
         <DCC_Optimize>false</DCC_Optimize>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.1.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_MinorVer>1</VerInfo_MinorVer>
         <Debugger_HostApplication>C:\Work\software\OpenBLT\Host\MicroBoot.exe</Debugger_HostApplication>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
diff --git a/Host/Source/MicroBoot/interfaces/net/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/net/XcpSettings.dfm
index b35a68d2..1d9d91c6 100644
Binary files a/Host/Source/MicroBoot/interfaces/net/XcpSettings.dfm and b/Host/Source/MicroBoot/interfaces/net/XcpSettings.dfm differ
diff --git a/Host/Source/MicroBoot/interfaces/net/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/net/XcpSettings.pas
index ea11d0a0..15b41053 100644
--- a/Host/Source/MicroBoot/interfaces/net/XcpSettings.pas
+++ b/Host/Source/MicroBoot/interfaces/net/XcpSettings.pas
@@ -76,6 +76,11 @@ type
     edtPort: TEdit;
     edtTconnect: TEdit;
     lblTconnect: TLabel;
+    tabSession: TTabSheet;
+    iconXcp3: TImage;
+    lblXcpSession: TLabel;
+    lblConnectMode: TLabel;
+    cmbConnectMode: TComboBox;
     procedure btnOKClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure btnBrowseClick(Sender: TObject);
@@ -211,6 +216,7 @@ begin
     FSettingsForm.edtT5.Text := IntToStr(settingsIni.ReadInteger('xcp', 't5', 1000));
     FSettingsForm.edtT7.Text := IntToStr(settingsIni.ReadInteger('xcp', 't7', 2000));
     FSettingsForm.edtTconnect.Text := IntToStr(settingsIni.ReadInteger('xcp', 'tconnect', 300));
+    FSettingsForm.cmbConnectMode.ItemIndex := settingsIni.ReadInteger('xcp', 'connectmode', 0);
 
     // release ini file object
     settingsIni.Free;
@@ -230,6 +236,7 @@ begin
     FSettingsForm.edtT5.Text := IntToStr(1000);
     FSettingsForm.edtT7.Text := IntToStr(2000);
     FSettingsForm.edtTconnect.Text := IntToStr(300);
+    FSettingsForm.cmbConnectMode.ItemIndex := 0;
   end;
 
   // show the form as modal so we can get the result here
@@ -252,6 +259,7 @@ begin
       settingsIni.WriteInteger('xcp', 't5', StrToInt(FSettingsForm.edtT5.Text));
       settingsIni.WriteInteger('xcp', 't7', StrToInt(FSettingsForm.edtT7.Text));
       settingsIni.WriteInteger('xcp', 'tconnect', StrToInt(FSettingsForm.edtTconnect.Text));
+      settingsIni.WriteInteger('xcp', 'connectmode', FSettingsForm.cmbConnectMode.ItemIndex);
 
       // release ini file object
       settingsIni.Free;
diff --git a/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj b/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj
index 707c705a..ea98e2d8 100644
--- a/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj
+++ b/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.1</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -70,7 +70,7 @@
         <DCC_Optimize>false</DCC_Optimize>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.1.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_MinorVer>1</VerInfo_MinorVer>
         <Manifest_File>(None)</Manifest_File>
         <VerInfo_Locale>1033</VerInfo_Locale>
diff --git a/Host/Source/MicroBoot/interfaces/uart/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/uart/XcpSettings.dfm
index 67620e7d..28d45f21 100644
Binary files a/Host/Source/MicroBoot/interfaces/uart/XcpSettings.dfm and b/Host/Source/MicroBoot/interfaces/uart/XcpSettings.dfm differ
diff --git a/Host/Source/MicroBoot/interfaces/uart/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/uart/XcpSettings.pas
index f2d34ab6..548fa338 100644
--- a/Host/Source/MicroBoot/interfaces/uart/XcpSettings.pas
+++ b/Host/Source/MicroBoot/interfaces/uart/XcpSettings.pas
@@ -76,6 +76,11 @@ type
     openDialog: TOpenDialog;
     edtTconnect: TEdit;
     lblTconnect: TLabel;
+    tabSession: TTabSheet;
+    iconXcp3: TImage;
+    lblXcpSession: TLabel;
+    lblConnectMode: TLabel;
+    cmbConnectMode: TComboBox;
     procedure btnOKClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure btnBrowseClick(Sender: TObject);
@@ -211,6 +216,7 @@ begin
     FSettingsForm.edtT5.Text := IntToStr(settingsIni.ReadInteger('xcp', 't5', 1000));
     FSettingsForm.edtT7.Text := IntToStr(settingsIni.ReadInteger('xcp', 't7', 2000));
     FSettingsForm.edtTconnect.Text := IntToStr(settingsIni.ReadInteger('xcp', 'tconnect', 20));
+    FSettingsForm.cmbConnectMode.ItemIndex := settingsIni.ReadInteger('xcp', 'connectmode', 0);
 
     // release ini file object
     settingsIni.Free;
@@ -230,6 +236,7 @@ begin
     FSettingsForm.edtT5.Text := IntToStr(1000);
     FSettingsForm.edtT7.Text := IntToStr(2000);
     FSettingsForm.edtTconnect.Text := IntToStr(20);
+    FSettingsForm.cmbConnectMode.ItemIndex := 0;
   end;
 
   // show the form as modal so we can get the result here
@@ -252,6 +259,7 @@ begin
       settingsIni.WriteInteger('xcp', 't5', StrToInt(FSettingsForm.edtT5.Text));
       settingsIni.WriteInteger('xcp', 't7', StrToInt(FSettingsForm.edtT7.Text));
       settingsIni.WriteInteger('xcp', 'tconnect', StrToInt(FSettingsForm.edtTconnect.Text));
+      settingsIni.WriteInteger('xcp', 'connectmode', FSettingsForm.cmbConnectMode.ItemIndex);
 
       // release ini file object
       settingsIni.Free;
diff --git a/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj
index fbccc625..c3fe0b58 100644
--- a/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj
+++ b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.1</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -71,7 +71,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_MinorVer>1</VerInfo_MinorVer>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.1.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Debugger_HostApplication>C:\Work\software\OpenBLT\Host\MicroBoot.exe</Debugger_HostApplication>
         <Manifest_File>(None)</Manifest_File>
diff --git a/Host/Source/MicroBoot/interfaces/usb/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/usb/XcpSettings.dfm
index 585cc2ee..cdca8cc4 100644
Binary files a/Host/Source/MicroBoot/interfaces/usb/XcpSettings.dfm and b/Host/Source/MicroBoot/interfaces/usb/XcpSettings.dfm differ
diff --git a/Host/Source/MicroBoot/interfaces/usb/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/usb/XcpSettings.pas
index f18a6271..0a73093d 100644
--- a/Host/Source/MicroBoot/interfaces/usb/XcpSettings.pas
+++ b/Host/Source/MicroBoot/interfaces/usb/XcpSettings.pas
@@ -69,6 +69,11 @@ type
     openDialog: TOpenDialog;
     edtTconnect: TEdit;
     lblTconnect: TLabel;
+    tabSession: TTabSheet;
+    iconXcp3: TImage;
+    lblXcpSession: TLabel;
+    lblConnectMode: TLabel;
+    cmbConnectMode: TComboBox;
     procedure btnOKClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure btnBrowseClick(Sender: TObject);
@@ -102,8 +107,7 @@ implementation
 procedure TXcpSettingsForm.btnOKClick(Sender: TObject);
 begin
   ModalResult := mrOK;
-end;
-//*** end of btnOKClick ***
+end; //*** end of btnOKClick ***
 
 
 //***************************************************************************************
@@ -201,6 +205,7 @@ begin
     FSettingsForm.edtT5.Text := IntToStr(settingsIni.ReadInteger('xcp', 't5', 1000));
     FSettingsForm.edtT7.Text := IntToStr(settingsIni.ReadInteger('xcp', 't7', 2000));
     FSettingsForm.edtTconnect.Text := IntToStr(settingsIni.ReadInteger('xcp', 'tconnect', 20));
+    FSettingsForm.cmbConnectMode.ItemIndex := settingsIni.ReadInteger('xcp', 'connectmode', 0);
 
     // release ini file object
     settingsIni.Free;
@@ -216,6 +221,7 @@ begin
     FSettingsForm.edtT5.Text := IntToStr(1000);
     FSettingsForm.edtT7.Text := IntToStr(2000);
     FSettingsForm.edtTconnect.Text := IntToStr(20);
+    FSettingsForm.cmbConnectMode.ItemIndex := 0;
   end;
 
   // show the form as modal so we can get the result here
@@ -234,6 +240,7 @@ begin
       settingsIni.WriteInteger('xcp', 't5', StrToInt(FSettingsForm.edtT5.Text));
       settingsIni.WriteInteger('xcp', 't7', StrToInt(FSettingsForm.edtT7.Text));
       settingsIni.WriteInteger('xcp', 'tconnect', StrToInt(FSettingsForm.edtTconnect.Text));
+      settingsIni.WriteInteger('xcp', 'connectmode', FSettingsForm.cmbConnectMode.ItemIndex);
 
       // release ini file object
       settingsIni.Free;
diff --git a/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj
index 50877238..4a8d109e 100644
--- a/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj
+++ b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.1</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -71,7 +71,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_MinorVer>1</VerInfo_MinorVer>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.1.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <Debugger_HostApplication>C:\Work\software\OpenBLT\Host\MicroBoot.exe</Debugger_HostApplication>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>(None)</Manifest_File>
diff --git a/Host/openblt_can_kvaser.dll b/Host/openblt_can_kvaser.dll
index 94538dce..e52cfa55 100644
Binary files a/Host/openblt_can_kvaser.dll and b/Host/openblt_can_kvaser.dll differ
diff --git a/Host/openblt_can_kvaser.ini b/Host/openblt_can_kvaser.ini
index 8f268943..5ffbd149 100644
--- a/Host/openblt_can_kvaser.ini
+++ b/Host/openblt_can_kvaser.ini
@@ -13,3 +13,4 @@ t4=10000
 t5=1000
 t7=2000
 tconnect=20
+connectmode=0
diff --git a/Host/openblt_can_lawicel.dll b/Host/openblt_can_lawicel.dll
index 5eb5a82c..8795cb23 100644
Binary files a/Host/openblt_can_lawicel.dll and b/Host/openblt_can_lawicel.dll differ
diff --git a/Host/openblt_can_lawicel.ini b/Host/openblt_can_lawicel.ini
index a0c9bdec..f2158ff6 100644
--- a/Host/openblt_can_lawicel.ini
+++ b/Host/openblt_can_lawicel.ini
@@ -13,3 +13,4 @@ t4=10000
 t5=1000
 t7=2000
 tconnect=20
+connectmode=0
diff --git a/Host/openblt_can_peak.dll b/Host/openblt_can_peak.dll
index 6d4836a5..7b10514f 100644
Binary files a/Host/openblt_can_peak.dll and b/Host/openblt_can_peak.dll differ
diff --git a/Host/openblt_can_peak.ini b/Host/openblt_can_peak.ini
index a0c9bdec..f2158ff6 100644
--- a/Host/openblt_can_peak.ini
+++ b/Host/openblt_can_peak.ini
@@ -13,3 +13,4 @@ t4=10000
 t5=1000
 t7=2000
 tconnect=20
+connectmode=0
diff --git a/Host/openblt_net.dll b/Host/openblt_net.dll
index e8fb0a02..f73d78ca 100644
Binary files a/Host/openblt_net.dll and b/Host/openblt_net.dll differ
diff --git a/Host/openblt_net.ini b/Host/openblt_net.ini
index f3c77908..fb3cba4d 100644
--- a/Host/openblt_net.ini
+++ b/Host/openblt_net.ini
@@ -9,3 +9,4 @@ t4=10000
 t5=1000
 t7=2000
 tconnect=300
+connectmode=0
diff --git a/Host/openblt_uart.dll b/Host/openblt_uart.dll
index b485ef68..bab6170d 100644
Binary files a/Host/openblt_uart.dll and b/Host/openblt_uart.dll differ
diff --git a/Host/openblt_uart.ini b/Host/openblt_uart.ini
index cafafe98..afb91d48 100644
--- a/Host/openblt_uart.ini
+++ b/Host/openblt_uart.ini
@@ -9,3 +9,4 @@ t4=10000
 t5=1000
 t7=2000
 tconnect=20
+connectmode=0
diff --git a/Host/openblt_usb.dll b/Host/openblt_usb.dll
index 164c7c70..ca837301 100644
Binary files a/Host/openblt_usb.dll and b/Host/openblt_usb.dll differ
diff --git a/Host/openblt_usb.ini b/Host/openblt_usb.ini
index 16d7f206..c54f9f20 100644
--- a/Host/openblt_usb.ini
+++ b/Host/openblt_usb.ini
@@ -6,3 +6,4 @@ t4=10000
 t5=1000
 t7=2000
 tconnect=20
+connectmode=0