diff --git a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
index 7a20308c3..d96fe042d 100644
--- a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
+++ b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
@@ -71,8 +71,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="uplink.NET, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\uplink.NET.2.7.1604\lib\netstandard2.0\uplink.NET.dll</HintPath>
+    <Reference Include="uplink.NET, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\uplink.NET.2.12.3328\lib\netstandard2.0\uplink.NET.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -124,5 +124,33 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
   </Target>
+  <Target Name="CopyStorjLinuxLibrary" BeforeTargets="PrepareForBuild">
+    <Message Text="Executing Storj Linux native library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Linux.2.12.3328/runtimes/linux-x64/native/storj_uplink.so"
+      DestinationFiles="$(ProjectDir)libstorj_uplink.so" />
+    <Message Text="Copied Linux uplink native library" Importance="High" />
+  </Target>
+  <Target Name="CopyStorjMacLibrary" BeforeTargets="PrepareForBuild">
+    <Message Text="Executing Storj Linux native library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Mac.2.12.3328/runtimes/osx-x64/native/libstorj_uplink.dylib"
+      DestinationFiles="$(ProjectDir)libstorj_uplink.dylib" />
+      <Message Text="Copied Mac uplink native library" Importance="High" />
+  </Target>
+  <Target Name="CopyStorjWinLibrary64" BeforeTargets="PrepareForBuild">
+     <Message Text="Executing Storj Windows native 64 library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x64/native/storj_uplink.dll"
+      DestinationFolder="$(ProjectDir)win-x64" />
+      <Message Text="Copied Windows uplink native 64 library" Importance="High" />
+  </Target>
+  <Target Name="CopyStorjWinLibrary32" BeforeTargets="PrepareForBuild">
+     <Message Text="Executing Storj Windows native 32 library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x86/native/storj_uplink.dll"
+      DestinationFolder="$(ProjectDir)win-x86" />
+      <Message Text="Copied Windows uplink native 32 library" Importance="High" />
+  </Target>
   <Import Project="..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
 </Project>
diff --git a/Duplicati/Library/Backend/Storj/libstorj_uplink.dylib b/Duplicati/Library/Backend/Storj/libstorj_uplink.dylib
deleted file mode 100644
index 4f8ea2938..000000000
Binary files a/Duplicati/Library/Backend/Storj/libstorj_uplink.dylib and /dev/null differ
diff --git a/Duplicati/Library/Backend/Storj/libstorj_uplink.so b/Duplicati/Library/Backend/Storj/libstorj_uplink.so
deleted file mode 100644
index f4f495271..000000000
Binary files a/Duplicati/Library/Backend/Storj/libstorj_uplink.so and /dev/null differ
diff --git a/Duplicati/Library/Backend/Storj/packages.config b/Duplicati/Library/Backend/Storj/packages.config
index 79bd0f093..a0f788f4a 100644
--- a/Duplicati/Library/Backend/Storj/packages.config
+++ b/Duplicati/Library/Backend/Storj/packages.config
@@ -9,5 +9,8 @@
   <package id="System.Memory" version="4.5.5" targetFramework="net471" />
   <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net471" />
-  <package id="uplink.NET" version="2.7.1604" targetFramework="net471" />
+  <package id="uplink.NET" version="2.12.3328" targetFramework="net471" />
+  <package id="uplink.NET.Win" version="2.12.3328" targetFramework="net471" />
+  <package id="uplink.NET.Linux" version="2.12.3328" targetFramework="net471" />
+  <package id="uplink.NET.Mac" version="2.12.3328" targetFramework="net471" />
 </packages>
diff --git a/Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll b/Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll
deleted file mode 100644
index dbbca788d..000000000
Binary files a/Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll and /dev/null differ
diff --git a/Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll b/Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll
deleted file mode 100644
index bbc697695..000000000
Binary files a/Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll and /dev/null differ
diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
index ee8a71e71..dc2fd1ab8 100644
--- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
+++ b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
@@ -71,8 +71,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="uplink.NET, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\uplink.NET.2.7.1604\lib\netstandard2.0\uplink.NET.dll</HintPath>
+    <Reference Include="uplink.NET, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\uplink.NET.2.12.3328\lib\netstandard2.0\uplink.NET.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -112,5 +112,33 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
   </Target>
+  <Target Name="CopyTardigradeLinuxLibrary" BeforeTargets="PrepareForBuild">
+    <Message Text="Executing Tardigrade Linux native library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Linux.2.12.3328/runtimes/linux-x64/native/storj_uplink.so"
+      DestinationFiles="$(ProjectDir)libstorj_uplink.so" />
+    <Message Text="Copied Linux uplink native library" Importance="High" />
+  </Target>
+  <Target Name="CopyTardigradeMacLibrary" BeforeTargets="PrepareForBuild">
+    <Message Text="Executing Tardigrade Linux native library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Mac.2.12.3328/runtimes/osx-x64/native/libstorj_uplink.dylib"
+      DestinationFiles="$(ProjectDir)libstorj_uplink.dylib" />
+      <Message Text="Copied Mac uplink native library" Importance="High" />
+  </Target>
+  <Target Name="CopyTardigradeWinLibrary64" BeforeTargets="PrepareForBuild">
+     <Message Text="Executing Tardigrade Windows native 64 library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x64/native/storj_uplink.dll"
+      DestinationFolder="$(ProjectDir)win-x64" />
+      <Message Text="Copied Windows uplink native 64 library" Importance="High" />
+  </Target>
+  <Target Name="CopyTardigradeWinLibrary32" BeforeTargets="PrepareForBuild">
+     <Message Text="Executing Tardigrade Windows native 32 library copy task" Importance="High" />
+    <Copy
+      SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x86/native/storj_uplink.dll"
+      DestinationFolder="$(ProjectDir)win-x86" />
+      <Message Text="Copied Windows uplink native 32 library" Importance="High" />
+  </Target>
   <Import Project="..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
 </Project>
diff --git a/Duplicati/Library/Backend/Tardigrade/packages.config b/Duplicati/Library/Backend/Tardigrade/packages.config
index 79bd0f093..a0f788f4a 100644
--- a/Duplicati/Library/Backend/Tardigrade/packages.config
+++ b/Duplicati/Library/Backend/Tardigrade/packages.config
@@ -9,5 +9,8 @@
   <package id="System.Memory" version="4.5.5" targetFramework="net471" />
   <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net471" />
-  <package id="uplink.NET" version="2.7.1604" targetFramework="net471" />
+  <package id="uplink.NET" version="2.12.3328" targetFramework="net471" />
+  <package id="uplink.NET.Win" version="2.12.3328" targetFramework="net471" />
+  <package id="uplink.NET.Linux" version="2.12.3328" targetFramework="net471" />
+  <package id="uplink.NET.Mac" version="2.12.3328" targetFramework="net471" />
 </packages>
diff --git a/Installer/AssemblyRedirects.xml b/Installer/AssemblyRedirects.xml
index 2d3e4f10f..6172e4924 100644
--- a/Installer/AssemblyRedirects.xml
+++ b/Installer/AssemblyRedirects.xml
@@ -45,6 +45,10 @@
             <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
             <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion = "4.0.1.2"/>
           </dependentAssembly>
+          <dependentAssembly>
+            <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+            <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion = "4.0.3.0"/>
+          </dependentAssembly>
 
         </assemblyBinding>
     </runtime>
diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile
index 550e7b9f1..e35671ea3 100755
--- a/Installer/Makefile/Makefile
+++ b/Installer/Makefile/Makefile
@@ -79,6 +79,9 @@ package: build
 clean:
 	(find "$(SOURCE_DIR)" -type d -name bin -exec rm -rf "{}" \; &> /dev/null) || echo "bin cleaned"
 	(find "$(SOURCE_DIR)" -type d -name obj -exec rm -rf "{}" \; &> /dev/null) || echo "obj cleaned"
+	(find "$(SOURCE_DIR)/Duplicati/Library/Backend" -name libstorj_uplink.so -exec rm -rf "{}" \;) || echo "storj linux lib cleaned"
+	(find "$(SOURCE_DIR)/Duplicati/Library/Backend" -name libstorj_uplink.dylib -exec rm -rf "{}" \;) || echo "storj mac lib cleaned"
+	(find "$(SOURCE_DIR)/Duplicati" -type d -name win-x* -exec rm -rf "{}" \;) || echo "storj win lib cleaned"
 	rm -rf "$(PACKAGE_DIR)"
 
 
diff --git a/Installer/Synology/make-binary-package.sh b/Installer/Synology/make-binary-package.sh
index e2cf0aac6..2848d3993 100644
--- a/Installer/Synology/make-binary-package.sh
+++ b/Installer/Synology/make-binary-package.sh
@@ -78,7 +78,6 @@ rm -rf ./licenses/MonoMac
 rm -rf ./licenses/gpg
 rm -rf ./win-x64/storj_uplink.dll
 rm -rf ./win-x86/storj_uplink.dll
-rm -rf ./storj_uplink.dll
 rm -rf ./libstorj_uplink.dylib
 
 # Install extra items for Synology
diff --git a/Installer/Windows/WixInstaller.wixproj b/Installer/Windows/WixInstaller.wixproj
index 58d9edca7..416dee29b 100644
--- a/Installer/Windows/WixInstaller.wixproj
+++ b/Installer/Windows/WixInstaller.wixproj
@@ -67,7 +67,7 @@
     </WixExtension>
   </ItemGroup>
   <ItemGroup>
-    <BinFiles Include="..\Duplicati\**" Exclude="..\**\*.pdb;..\**\SVGIcons\**\*.*;..\**\OSX Icons\**\*.*;..\**\lvm-scripts\**\*.*;..\**\libstorj_uplink.so;..\**\libstorj_uplink.dylib;..\**\storj_uplink.dll" />
+    <BinFiles Include="..\Duplicati\**" Exclude="..\**\*.pdb;..\**\SVGIcons\**\*.*;..\**\OSX Icons\**\*.*;..\**\lvm-scripts\**\*.*;..\**\libstorj_uplink.so;..\**\libstorj_uplink.dylib" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <Target Name="BeforeBuild">
diff --git a/Installer/debian/bin-rules.sh b/Installer/debian/bin-rules.sh
index 59bc408ad..db14d2a8a 100644
--- a/Installer/debian/bin-rules.sh
+++ b/Installer/debian/bin-rules.sh
@@ -61,7 +61,6 @@ override_dh_auto_install:
 	rm -rf build/lib/duplicati/licenses/gpg
 	rm -rf build/lib/duplicati/win-x64/storj_uplink.dll
 	rm -rf build/lib/duplicati/win-x86/storj_uplink.dll
-	rm -rf build/lib/duplicati/storj_uplink.dll
 	rm -rf build/lib/duplicati/libstorj_uplink.dylib
 	find build/lib/duplicati/* -type f | xargs chmod 644
 	find build/lib/duplicati/* -type d | xargs chmod 755
diff --git a/Installer/fedora/duplicati-binary.spec b/Installer/fedora/duplicati-binary.spec
index 5dd2da99d..98db46076 100644
--- a/Installer/fedora/duplicati-binary.spec
+++ b/Installer/fedora/duplicati-binary.spec
@@ -102,7 +102,6 @@ rm -rf licenses/MonoMac
 rm -rf licenses/gpg
 rm -rf win-x64\storj_uplink.dll
 rm -rf win-x86\storj_uplink.dll
-rm -rf storj_uplink.dll
 rm -rf libstorj_uplink.dylib