diff --git a/wst/trunk/base_service_intf.pas b/wst/trunk/base_service_intf.pas
index ed454d83e..e6f04fcf7 100644
--- a/wst/trunk/base_service_intf.pas
+++ b/wst/trunk/base_service_intf.pas
@@ -1199,8 +1199,15 @@ const
 
   function IsStoredPropClass(AClass : TClass;PropInfo : PPropInfo) : TPropStoreType;
 
+{$IFDEF FPC}
+  {$IFDEF FPC_211}
 var
   wst_FormatSettings : TFormatSettings;
+  {$ENDIF}
+{$ELSE}
+var
+  wst_FormatSettings : TFormatSettings;
+{$ENDIF}
 
 implementation
 uses imp_utils;
@@ -4508,11 +4515,15 @@ end;
 
 initialization
 {$IFDEF FPC}
+  {$IFDEF FPC_211}
   wst_FormatSettings := DefaultFormatSettings;
+  wst_FormatSettings.DecimalSeparator := '.';
+  {$ENDIF}
 {$ELSE}
   GetLocaleFormatSettings(GetThreadLocale(),wst_FormatSettings);
-{$ENDIF}
   wst_FormatSettings.DecimalSeparator := '.';
+{$ENDIF}
+
   TypeRegistryInstance := TTypeRegistry.Create();
   SerializeOptionsRegistryInstance := TSerializeOptionsRegistry.Create();
 
diff --git a/wst/trunk/base_soap_formatter.pas b/wst/trunk/base_soap_formatter.pas
index 3c1cf1b2e..b1fa1b6c6 100644
--- a/wst/trunk/base_soap_formatter.pas
+++ b/wst/trunk/base_soap_formatter.pas
@@ -746,6 +746,7 @@ function TSOAPBaseFormatter.PutFloat(
 Var
   s, frmt : string;
   prcsn : Integer;
+{$IFDEF FPC} {$IFNDEF FPC_211} i : Integer; {$ENDIF}{$ENDIF}
 begin
   Case GetTypeData(ATypeInfo)^.FloatType Of
     ftSingle,
@@ -755,10 +756,18 @@ begin
     ftExtended  : prcsn := 15;
   End;
   frmt := '#.' + StringOfChar('#',prcsn) + 'E-0';
+{$IFDEF FPC}
+  {$IFDEF FPC_211}
   s := FormatFloat(frmt,AData,wst_FormatSettings);
-//  i := Pos(',',s);
-  //If ( i > 0 ) Then
-    //s[i] := '.';
+  {$ELSE}
+  s := FormatFloat(frmt,AData);
+  i := Pos(',',s);
+  If ( i > 0 ) Then
+    s[i] := '.';
+  {$ENDIF}
+{$ELSE}
+  s := FormatFloat(frmt,AData,wst_FormatSettings);
+{$ENDIF}
   Result := InternalPutData(AName,ATypeInfo,s);
 end;
 
@@ -849,7 +858,16 @@ procedure TSOAPBaseFormatter.GetFloat(
   var AData        : Extended
 );
 begin
-  AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
+{$IFDEF FPC}
+  {$IFDEF FPC_211}
+    AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
+  {$ELSE}
+  AData := StrToFloatDef(Trim(GetNodeValue(AName)),0);
+  {$ENDIF}
+{$ELSE}
+    AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
+{$ENDIF}
+  //AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
 end;
 
 procedure TSOAPBaseFormatter.GetStr(
@@ -1656,7 +1674,15 @@ begin
       end;
     tkFloat :
       begin
+{$IFDEF FPC}
+  {$IFDEF FPC_211}
         floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
+  {$ELSE}
+        floatDt := StrToFloatDef(Trim(dataBuffer),0);
+  {$ENDIF}
+{$ELSE}
+        floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
+{$ENDIF}
         case GetTypeData(ATypeInfo)^.FloatType of
           ftSingle    : Single(AData)        := floatDt;
           ftDouble    : Double(AData)        := floatDt;
diff --git a/wst/trunk/base_xmlrpc_formatter.pas b/wst/trunk/base_xmlrpc_formatter.pas
index 3d79959e4..594d15ad8 100644
--- a/wst/trunk/base_xmlrpc_formatter.pas
+++ b/wst/trunk/base_xmlrpc_formatter.pas
@@ -834,7 +834,16 @@ procedure TXmlRpcBaseFormatter.GetFloat(
   var AData        : Extended
 );
 begin
-  AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
+{$IFDEF FPC}
+  {$IFDEF FPC_211}
+    AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
+  {$ELSE}
+  AData := StrToFloatDef(Trim(GetNodeValue(AName)),0);
+  {$ENDIF}
+{$ELSE}
+    AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
+{$ENDIF}
+  //AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
 end;
 
 procedure TXmlRpcBaseFormatter.GetStr(
@@ -1321,7 +1330,16 @@ begin
       end;
     tkFloat :
       begin
+{$IFDEF FPC}
+  {$IFDEF FPC_211}
         floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
+  {$ELSE}
+        floatDt := StrToFloatDef(Trim(dataBuffer),0);
+  {$ENDIF}
+{$ELSE}
+        floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
+{$ENDIF}
+        //floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
         case GetTypeData(ATypeInfo)^.FloatType of
           ftSingle    : Single(AData)        := floatDt;
           ftDouble    : Double(AData)        := floatDt;
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpi b/wst/trunk/tests/test_suite/wst_test_suite.lpi
index 305289586..f7e58f8ec 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpi
@@ -7,7 +7,7 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ActiveEditorIndexAtStart Value="2"/>
     </General>
     <PublishOptions>
       <Version Value="2"/>
@@ -74,8 +74,8 @@
         <Filename Value="..\..\base_service_intf.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_service_intf"/>
-        <CursorPos X="17" Y="4108"/>
-        <TopLine Value="4060"/>
+        <CursorPos X="46" Y="4524"/>
+        <TopLine Value="4504"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="200"/>
         <Bookmarks Count="2">
@@ -88,8 +88,8 @@
         <Filename Value="..\..\base_soap_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_soap_formatter"/>
-        <CursorPos X="3" Y="545"/>
-        <TopLine Value="528"/>
+        <CursorPos X="1" Y="1677"/>
+        <TopLine Value="1664"/>
         <EditorIndex Value="1"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
@@ -190,7 +190,7 @@
         <UnitName Value="server_service_intf"/>
         <CursorPos X="54" Y="19"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="3"/>
         <UsageCount Value="203"/>
         <Loaded Value="True"/>
       </Unit17>
@@ -281,7 +281,7 @@
         <UnitName Value="test_parserdef"/>
         <CursorPos X="93" Y="76"/>
         <TopLine Value="11"/>
-        <UsageCount Value="172"/>
+        <UsageCount Value="173"/>
       </Unit30>
       <Unit31>
         <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/>
@@ -319,9 +319,11 @@
         <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_xmlrpc_formatter"/>
-        <CursorPos X="26" Y="13"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="110"/>
+        <CursorPos X="9" Y="1341"/>
+        <TopLine Value="1319"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="111"/>
+        <Loaded Value="True"/>
       </Unit36>
       <Unit37>
         <Filename Value="..\..\ws_helper\pscanner.pp"/>
@@ -443,7 +445,7 @@
         <UnitName Value="wst_fpc_xml"/>
         <CursorPos X="8" Y="38"/>
         <TopLine Value="11"/>
-        <UsageCount Value="56"/>
+        <UsageCount Value="57"/>
       </Unit54>
       <Unit55>
         <Filename Value="..\..\wst_global.inc"/>
@@ -465,7 +467,7 @@
         <CursorPos X="29" Y="43"/>
         <TopLine Value="3"/>
         <EditorIndex Value="8"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="48"/>
         <Loaded Value="True"/>
       </Unit57>
       <Unit58>
@@ -473,9 +475,7 @@
         <UnitName Value="fpcunit"/>
         <CursorPos X="21" Y="99"/>
         <TopLine Value="84"/>
-        <EditorIndex Value="10"/>
         <UsageCount Value="15"/>
-        <Loaded Value="True"/>
       </Unit58>
       <Unit59>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-fpcunit\src\testregistry.pp"/>
@@ -504,9 +504,7 @@
         <UnitName Value="typinfo"/>
         <CursorPos X="79" Y="218"/>
         <TopLine Value="203"/>
-        <EditorIndex Value="3"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit62>
       <Unit63>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysstrh.inc"/>
@@ -521,28 +519,7 @@
         <UsageCount Value="11"/>
       </Unit64>
     </Units>
-    <JumpHistory Count="5" HistoryIndex="4">
-      <Position1>
-        <Filename Value="..\..\base_soap_formatter.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position1>
-      <Position2>
-        <Filename Value="..\..\base_soap_formatter.pas"/>
-        <Caret Line="543" Column="36" TopLine="528"/>
-      </Position2>
-      <Position3>
-        <Filename Value="..\..\binary_streamer.pas"/>
-        <Caret Line="15" Column="30" TopLine="1"/>
-      </Position3>
-      <Position4>
-        <Filename Value="..\..\binary_streamer.pas"/>
-        <Caret Line="261" Column="24" TopLine="238"/>
-      </Position4>
-      <Position5>
-        <Filename Value="..\..\base_service_intf.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position5>
-    </JumpHistory>
+    <JumpHistory Count="0" HistoryIndex="-1"/>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>