diff --git a/Demos/FeatureCenter/FeatureCenter.Module/FeatureCenter.Module.csproj b/Demos/FeatureCenter/FeatureCenter.Module/FeatureCenter.Module.csproj
index 788ada6988..83b6f21fb0 100644
--- a/Demos/FeatureCenter/FeatureCenter.Module/FeatureCenter.Module.csproj
+++ b/Demos/FeatureCenter/FeatureCenter.Module/FeatureCenter.Module.csproj
@@ -12,8 +12,7 @@
     <AssemblyName>FeatureCenter.Module</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/Demos/Modules/ExcelImporter/ExcelImporterTester.Module.Web/ExcelImporterTester.Module.Web.csproj b/Demos/Modules/ExcelImporter/ExcelImporterTester.Module.Web/ExcelImporterTester.Module.Web.csproj
index 4a9ee0902c..dae89faa39 100644
--- a/Demos/Modules/ExcelImporter/ExcelImporterTester.Module.Web/ExcelImporterTester.Module.Web.csproj
+++ b/Demos/Modules/ExcelImporter/ExcelImporterTester.Module.Web/ExcelImporterTester.Module.Web.csproj
@@ -11,10 +11,8 @@
     <RootNamespace>ExcelImporterTester.Module.Web</RootNamespace>
     <AssemblyName>ExcelImporterTester.Module.Web</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <FileUpgradeFlags></FileUpgradeFlags>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
diff --git a/Demos/Modules/ExcelImporter/ExcelImporterTester.Module/ExcelImporterTester.Module.csproj b/Demos/Modules/ExcelImporter/ExcelImporterTester.Module/ExcelImporterTester.Module.csproj
index 3c1076bca1..d98ccaaf92 100644
--- a/Demos/Modules/ExcelImporter/ExcelImporterTester.Module/ExcelImporterTester.Module.csproj
+++ b/Demos/Modules/ExcelImporter/ExcelImporterTester.Module/ExcelImporterTester.Module.csproj
@@ -11,10 +11,8 @@
     <RootNamespace>ExcelImporterTester.Module</RootNamespace>
     <AssemblyName>ExcelImporterTester.Module</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <FileUpgradeFlags></FileUpgradeFlags>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile />
     <LangVersion>latest</LangVersion>
diff --git a/Demos/SecurityDemo/SecurityDemo.Module/SecurityDemo.Module.csproj b/Demos/SecurityDemo/SecurityDemo.Module/SecurityDemo.Module.csproj
index 97d200a1cb..bd42c1c9d6 100644
--- a/Demos/SecurityDemo/SecurityDemo.Module/SecurityDemo.Module.csproj
+++ b/Demos/SecurityDemo/SecurityDemo.Module/SecurityDemo.Module.csproj
@@ -10,11 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SecurityDemo.Module</RootNamespace>
     <AssemblyName>SecurityDemo.Module</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
diff --git a/Readme.md b/Readme.md
index e3799e6c17..317b8884e7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -26,6 +26,7 @@ The _eXpandFramework_ team have extended the capabilities of the _eXpressApp Fra
 The main idea _behind eXpandFramework_ is to offer as many features as possible to developers/business users  through a declarative approach (configuring files rather than writing code). Please go through each of the following brief descriptions and find out how _eXpandFramework_ can help you accomplish your complex development tasks with easy declarative programming. Below you can see some descriptions and screenshots of our basic modules (screenshots taken from eXpand FeatureCenter application that comes along with the download). In the folder _Demos_ you can find a list of demos like _XVideoRental_, _SecurityDemo_, _MiddleTier_, _Workflow_ and _installation helper solutions for each module_.
 
 ## Modules
+Additional standalone well documented/tested modules that work with ALL XAF versions and may not distributed from this repository can be found at [DevExpresss.XAF](https://github.com/eXpandFramework/DevExpress.XAF) repository.
 
 Examples of those modules include (in the two right columns you can see the supported platform):
 
diff --git a/Tests/Xpand.Test.WorldCreator/Xpand.Test.WorldCreator.csproj b/Tests/Xpand.Test.WorldCreator/Xpand.Test.WorldCreator.csproj
index 157081f9a0..10f3f44710 100644
--- a/Tests/Xpand.Test.WorldCreator/Xpand.Test.WorldCreator.csproj
+++ b/Tests/Xpand.Test.WorldCreator/Xpand.Test.WorldCreator.csproj
@@ -13,8 +13,7 @@
     <AssemblyName>Xpand.Test.WorldCreator</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
     <LangVersion>latest</LangVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Tests/Xpand.Test/Xpand.Test.csproj b/Tests/Xpand.Test/Xpand.Test.csproj
index 03cb24b48a..8766e9521d 100644
--- a/Tests/Xpand.Test/Xpand.Test.csproj
+++ b/Tests/Xpand.Test/Xpand.Test.csproj
@@ -14,8 +14,7 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,8 +41,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionCS.zip b/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionCS.zip
index b478792a7b..7b300f5ec4 100644
Binary files a/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionCS.zip and b/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionCS.zip differ
diff --git a/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionVB.zip b/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionVB.zip
index c6ee86eecd..18ff9bcaf9 100644
Binary files a/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionVB.zip and b/Xpand.Plugins/Xpand.VSIX/ProjectTemplates/DevExpress XAF/SolutionVB.zip differ
diff --git a/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj b/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj
index 4513971487..17a7f4f79c 100644
--- a/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj
+++ b/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj
@@ -5,15 +5,12 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
     <UseCodebase>true</UseCodebase>
     <LangVersion>latest</LangVersion>
     <TargetFrameworkProfile />
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <FileUpgradeFlags></FileUpgradeFlags>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <OldToolsVersion>14.0</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -479,8 +476,7 @@
   </Target>
 
   -->
-  <Target Name="BeforeBuild">
-  </Target>
+  <Target Name="BeforeBuild"></Target>
   <Import Project="..\..\Support\_third_party_assemblies\Packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\Support\_third_party_assemblies\Packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
   <Import Project="..\..\Support\_third_party_assemblies\Packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\Support\_third_party_assemblies\Packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets')" />
   <Import Project="..\..\Support\_third_party_assemblies\Packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\..\Support\_third_party_assemblies\Packages\Fody.4.2.1\build\Fody.targets')" />
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj
index 4d60750aa8..56e7c3d515 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj
@@ -231,11 +231,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/packages.config b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/packages.config
index 264dd6a8d7..1fcba3eb98 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="fasterflect" version="2.1.3" targetFramework="net40" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj
index 987fb747f5..adbce65376 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj
@@ -255,11 +255,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/packages.config b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/packages.config
index 264dd6a8d7..1fcba3eb98 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="fasterflect" version="2.1.3" targetFramework="net40" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj b/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj
index 698634e3f7..bb05f40550 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj
@@ -165,12 +165,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\Xpand.DLL\Xpand.Utils.dll</HintPath>
     </Reference>
-    <Reference Include="Xpand.XAF.Modules.Reactive, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
-      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.Reactive.1.1.0\lib\net4.6.1\Xpand.XAF.Modules.Reactive.dll</HintPath>
+    <Reference Include="Xpand.XAF.Modules.Reactive, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
+      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.Reactive.1.2.0\lib\net4.6.1\Xpand.XAF.Modules.Reactive.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xpand.XAF.Modules.ViewEditMode, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
-      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.ViewEditMode.1.1.0\lib\net4.6.1\Xpand.XAF.Modules.ViewEditMode.dll</HintPath>
+    <Reference Include="Xpand.XAF.Modules.ViewEditMode, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
+      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.ViewEditMode.1.2.0\lib\net4.6.1\Xpand.XAF.Modules.ViewEditMode.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xpand.Xpo">
@@ -283,11 +283,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Dashboard/packages.config b/Xpand/Xpand.ExpressApp.Modules/Dashboard/packages.config
index fb434da973..abd67a4265 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Dashboard/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/Dashboard/packages.config
@@ -5,7 +5,7 @@
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
-  <package id="Xpand.XAF.Modules.Reactive" version="1.1.0" targetFramework="net461" />
-  <package id="Xpand.XAF.Modules.ViewEditMode" version="1.1.0" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
+  <package id="Xpand.XAF.Modules.Reactive" version="1.2.0" targetFramework="net461" />
+  <package id="Xpand.XAF.Modules.ViewEditMode" version="1.2.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Xpand.ExpressApp.Email.csproj b/Xpand/Xpand.ExpressApp.Modules/Email/Xpand.ExpressApp.Email.csproj
index 94a45e09cc..c0981945eb 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Xpand.ExpressApp.Email.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/Email/Xpand.ExpressApp.Email.csproj
@@ -229,11 +229,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/packages.config b/Xpand/Xpand.ExpressApp.Modules/Email/packages.config
index 0650182170..f130f9d33b 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Email/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/Email/packages.config
@@ -4,6 +4,6 @@
   <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
   <package id="RazorEngine" version="3.10.0" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Xpand.ExpressApp.ExcelImporter.Web.csproj b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Xpand.ExpressApp.ExcelImporter.Web.csproj
index a4fdc22720..d640794633 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Xpand.ExpressApp.ExcelImporter.Web.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Xpand.ExpressApp.ExcelImporter.Web.csproj
@@ -12,10 +12,8 @@
     <AssemblyName>Xpand.ExpressApp.ExcelImporter.Web</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\..\Xpand.Key\Xpand.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <FileUpgradeFlags></FileUpgradeFlags>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile />
     <LangVersion>latest</LangVersion>
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj
index 6074dae4dc..d4789d2a55 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj
@@ -12,10 +12,8 @@
     <AssemblyName>Xpand.ExpressApp.ExcelImporter.Win</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\..\Xpand.Key\Xpand.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <FileUpgradeFlags></FileUpgradeFlags>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile />
     <LangVersion>latest</LangVersion>
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Xpand.ExpressApp.ExcelImporter.csproj b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Xpand.ExpressApp.ExcelImporter.csproj
index 4af85f141e..08ac71a998 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Xpand.ExpressApp.ExcelImporter.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Xpand.ExpressApp.ExcelImporter.csproj
@@ -161,12 +161,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\Xpand.DLL\Xpand.Utils.dll</HintPath>
     </Reference>
-    <Reference Include="Xpand.XAF.Modules.Reactive, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
-      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.Reactive.1.1.0\lib\net4.6.1\Xpand.XAF.Modules.Reactive.dll</HintPath>
+    <Reference Include="Xpand.XAF.Modules.Reactive, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
+      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.Reactive.1.2.0\lib\net4.6.1\Xpand.XAF.Modules.Reactive.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xpand.XAF.Modules.ViewEditMode, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
-      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.ViewEditMode.1.1.0\lib\net4.6.1\Xpand.XAF.Modules.ViewEditMode.dll</HintPath>
+    <Reference Include="Xpand.XAF.Modules.ViewEditMode, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
+      <HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.ViewEditMode.1.2.0\lib\net4.6.1\Xpand.XAF.Modules.ViewEditMode.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xpand.Xpo">
@@ -230,11 +230,11 @@
 if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)" "$(TargetPath).locked"</PreBuildEvent>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/packages.config b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/packages.config
index 4056b18a90..91a1c1aa55 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/packages.config
@@ -8,7 +8,7 @@
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
-  <package id="Xpand.XAF.Modules.Reactive" version="1.1.0" targetFramework="net461" />
-  <package id="Xpand.XAF.Modules.ViewEditMode" version="1.1.0" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
+  <package id="Xpand.XAF.Modules.Reactive" version="1.2.0" targetFramework="net461" />
+  <package id="Xpand.XAF.Modules.ViewEditMode" version="1.2.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/MasterDetail/Xpand.ExpressApp.MasterDetail.csproj b/Xpand/Xpand.ExpressApp.Modules/MasterDetail/Xpand.ExpressApp.MasterDetail.csproj
index 3dd8033ae2..e7b6b92aac 100644
--- a/Xpand/Xpand.ExpressApp.Modules/MasterDetail/Xpand.ExpressApp.MasterDetail.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/MasterDetail/Xpand.ExpressApp.MasterDetail.csproj
@@ -209,11 +209,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/MasterDetail/packages.config b/Xpand/Xpand.ExpressApp.Modules/MasterDetail/packages.config
index 264dd6a8d7..1fcba3eb98 100644
--- a/Xpand/Xpand.ExpressApp.Modules/MasterDetail/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/MasterDetail/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="fasterflect" version="2.1.3" targetFramework="net40" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/Xpand.ExpressApp.ModelArtifactState.csproj b/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/Xpand.ExpressApp.ModelArtifactState.csproj
index 92cbfe7438..8045a3e282 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/Xpand.ExpressApp.ModelArtifactState.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/Xpand.ExpressApp.ModelArtifactState.csproj
@@ -268,11 +268,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/packages.config b/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/packages.config
index 0c9aa9d15c..19cc468879 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/ModelArtifactState/packages.config
@@ -3,6 +3,6 @@
   <package id="fasterflect" version="2.1.3" targetFramework="net461" />
   <package id="Mono.Cecil" version="0.10.3" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ModelDifference/Xpand.ExpressApp.ModelDifference.csproj b/Xpand/Xpand.ExpressApp.Modules/ModelDifference/Xpand.ExpressApp.ModelDifference.csproj
index 1153422394..1f0bbf5166 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ModelDifference/Xpand.ExpressApp.ModelDifference.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ModelDifference/Xpand.ExpressApp.ModelDifference.csproj
@@ -315,11 +315,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ModelDifference/packages.config b/Xpand/Xpand.ExpressApp.Modules/ModelDifference/packages.config
index 264dd6a8d7..1fcba3eb98 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ModelDifference/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/ModelDifference/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="fasterflect" version="2.1.3" targetFramework="net40" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Security/Xpand.ExpressApp.Security.csproj b/Xpand/Xpand.ExpressApp.Modules/Security/Xpand.ExpressApp.Security.csproj
index 13a5417a27..4d969bb82e 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Security/Xpand.ExpressApp.Security.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/Security/Xpand.ExpressApp.Security.csproj
@@ -283,11 +283,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Security/packages.config b/Xpand/Xpand.ExpressApp.Modules/Security/packages.config
index 264dd6a8d7..1fcba3eb98 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Security/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/Security/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="fasterflect" version="2.1.3" targetFramework="net40" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/WorldCreator/Xpand.ExpressApp.WorldCreator.csproj b/Xpand/Xpand.ExpressApp.Modules/WorldCreator/Xpand.ExpressApp.WorldCreator.csproj
index 805c753321..ad87f176d8 100644
--- a/Xpand/Xpand.ExpressApp.Modules/WorldCreator/Xpand.ExpressApp.WorldCreator.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/WorldCreator/Xpand.ExpressApp.WorldCreator.csproj
@@ -285,11 +285,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
+  <Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
+    <Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/WorldCreator/packages.config b/Xpand/Xpand.ExpressApp.Modules/WorldCreator/packages.config
index 86b24f7bc7..bb30610a50 100644
--- a/Xpand/Xpand.ExpressApp.Modules/WorldCreator/packages.config
+++ b/Xpand/Xpand.ExpressApp.Modules/WorldCreator/packages.config
@@ -4,6 +4,6 @@
   <package id="fasterflect" version="2.1.3" targetFramework="net4" />
   <package id="Mono.Cecil" version="0.10.3" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
+  <package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
   <package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/XtraDashboard.Web/Xpand.ExpressApp.XtraDashboard.Web.csproj b/Xpand/Xpand.ExpressApp.Modules/XtraDashboard.Web/Xpand.ExpressApp.XtraDashboard.Web.csproj
index a82f184275..2837aa620e 100644
--- a/Xpand/Xpand.ExpressApp.Modules/XtraDashboard.Web/Xpand.ExpressApp.XtraDashboard.Web.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/XtraDashboard.Web/Xpand.ExpressApp.XtraDashboard.Web.csproj
@@ -11,11 +11,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xpand.ExpressApp.XtraDashboard.Web</RootNamespace>
     <AssemblyName>Xpand.ExpressApp.XtraDashboard.Web</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
@@ -36,8 +34,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/Xpand.ExpressApp.Win.csproj b/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/Xpand.ExpressApp.Win.csproj
index 5a9a3c0fef..0f711266e6 100644
--- a/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/Xpand.ExpressApp.Win.csproj
+++ b/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/Xpand.ExpressApp.Win.csproj
@@ -17,8 +17,7 @@
     <SignAssembly>true</SignAssembly>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <OutputPath>..\..\..\Xpand.DLL\</OutputPath>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <TargetFrameworkProfile />
@@ -38,8 +37,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <Prefer32Bit>false</Prefer32Bit>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Xpand/Xpand.ExpressApp/Xpand.ExpressApp/Xpand.ExpressApp.csproj b/Xpand/Xpand.ExpressApp/Xpand.ExpressApp/Xpand.ExpressApp.csproj
index 9f0d9c7238..a8d0d814f0 100644
--- a/Xpand/Xpand.ExpressApp/Xpand.ExpressApp/Xpand.ExpressApp.csproj
+++ b/Xpand/Xpand.ExpressApp/Xpand.ExpressApp/Xpand.ExpressApp.csproj
@@ -16,8 +16,7 @@
     <SignAssembly>true</SignAssembly>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <OutputPath>..\..\..\Xpand.DLL\</OutputPath>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <TargetFrameworkProfile />
@@ -37,8 +36,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Xpand/Xpand.Persistent/Xpand.Persistent.Base/Xpand.Persistent.Base.csproj b/Xpand/Xpand.Persistent/Xpand.Persistent.Base/Xpand.Persistent.Base.csproj
index 6458ffc790..ad122a4e41 100644
--- a/Xpand/Xpand.Persistent/Xpand.Persistent.Base/Xpand.Persistent.Base.csproj
+++ b/Xpand/Xpand.Persistent/Xpand.Persistent.Base/Xpand.Persistent.Base.csproj
@@ -17,8 +17,7 @@
     <SignAssembly>true</SignAssembly>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <OutputPath>..\..\..\Xpand.DLL\</OutputPath>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <PublishUrl>http://localhost/Xpand.Persistent.Base/</PublishUrl>
@@ -38,8 +37,7 @@
     <TargetFrameworkProfile />
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,8 +50,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/Xpand/Xpand.Persistent/Xpand.Persistent.BaseImpl/Xpand.Persistent.BaseImpl.csproj b/Xpand/Xpand.Persistent/Xpand.Persistent.BaseImpl/Xpand.Persistent.BaseImpl.csproj
index 8c1555a50c..70035b82b2 100644
--- a/Xpand/Xpand.Persistent/Xpand.Persistent.BaseImpl/Xpand.Persistent.BaseImpl.csproj
+++ b/Xpand/Xpand.Persistent/Xpand.Persistent.BaseImpl/Xpand.Persistent.BaseImpl.csproj
@@ -17,8 +17,7 @@
     <SignAssembly>true</SignAssembly>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <OutputPath>..\..\..\Xpand.DLL\</OutputPath>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <TargetFrameworkProfile />
@@ -38,8 +37,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/build.ps1 b/build.ps1
index 76ade6075a..3187762dd9 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,4 +1,4 @@
-$sources=@("https://api.nuget.org/v3/index.json","https://xpandnugetserver.azurewebsites.net/nuget","C:\Program Files (x86)\DevExpress 18.2\Components\System\Components\packages")   
+$sources=@("https://api.nuget.org/v3/index.json","https://xpandnugetserver.azurewebsites.net/nuget",(Get-Feed -DX))   
 & $PSScriptRoot\support\build\go.ps1 -taskList @("Release") -packageSources $sources -msbuildArgs @("/p:Configuration=Release","/WarnAsError","/v:m") -version "18.2.703.0" 
 exit $LastExitCode