diff --git a/3rdparty b/3rdparty
index 6876f1fce8d..b72af468984 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 6876f1fce8d1c70790c165dd7ed0b4214364e397
+Subproject commit b72af468984ee6b374ff614f2d87419fc12d0e90
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 63bcfa95791..679e85f1f14 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -791,7 +791,6 @@
     </InvalidReturnStatement>
     <InvalidReturnType occurrences="1">
       <code>string[]</code>
-      <code>string[]</code>
     </InvalidReturnType>
     <MoreSpecificImplementedParamType occurrences="1">
       <code>$members</code>
@@ -1016,6 +1015,11 @@
       <code>\Sabre\Uri\split($this-&gt;principalInfo['uri'])</code>
     </UndefinedFunction>
   </file>
+  <file src="apps/encryption/lib/Command/FixEncryptedVersion.php">
+    <TypeDoesNotContainNull occurrences="1">
+      <code>$user === null</code>
+    </TypeDoesNotContainNull>
+  </file>
   <file src="apps/encryption/lib/Command/ScanLegacyFormat.php">
     <InvalidOperand occurrences="1">
       <code>$this-&gt;scanFolder($output, '/' . $user)</code>
@@ -1274,28 +1278,18 @@
       <code>$this</code>
     </InvalidScope>
   </file>
-  <file src="apps/files_external/lib/Command/Applicable.php">
-    <InvalidArgument occurrences="1">
-      <code>$mountId</code>
-    </InvalidArgument>
-  </file>
-  <file src="apps/files_external/lib/Command/Config.php">
-    <InvalidArgument occurrences="1">
-      <code>$mountId</code>
-    </InvalidArgument>
-  </file>
   <file src="apps/files_external/lib/Command/Delete.php">
-    <InvalidArgument occurrences="2">
-      <code>$mountId</code>
-      <code>$mountId</code>
-    </InvalidArgument>
     <NullArgument occurrences="1">
       <code>null</code>
     </NullArgument>
   </file>
+  <file src="apps/files_external/lib/Command/ListCommand.php">
+    <InvalidScalarArgument occurrences="1">
+      <code>$userId</code>
+    </InvalidScalarArgument>
+  </file>
   <file src="apps/files_external/lib/Command/Notify.php">
-    <InvalidArgument occurrences="2">
-      <code>$input-&gt;getArgument('mount_id')</code>
+    <InvalidArgument occurrences="1">
       <code>$storage</code>
     </InvalidArgument>
     <InvalidReturnStatement occurrences="1"/>
@@ -1310,9 +1304,6 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="apps/files_external/lib/Command/Verify.php">
-    <InvalidArgument occurrences="1">
-      <code>$mountId</code>
-    </InvalidArgument>
     <InvalidScalarArgument occurrences="2">
       <code>$e-&gt;getCode()</code>
       <code>$status</code>
@@ -1375,6 +1366,12 @@
       <code>clearBucket</code>
     </UndefinedMagicMethod>
   </file>
+  <file src="apps/files_external/lib/Lib/Storage/FtpConnection.php">
+    <UndefinedConstant occurrences="2">
+      <code>FTP_BINARY</code>
+      <code>FTP_BINARY</code>
+    </UndefinedConstant>
+  </file>
   <file src="apps/files_external/lib/Lib/Storage/SFTP.php">
     <InternalMethod occurrences="1">
       <code>put</code>
@@ -2285,11 +2282,6 @@
   <file src="apps/user_status/lib/Db/UserStatusMapper.php">
     <MoreSpecificImplementedParamType occurrences="1"/>
   </file>
-  <file src="apps/user_status/lib/Service/StatusService.php">
-    <MismatchingDocblockParamType occurrences="1">
-      <code>string|null</code>
-    </MismatchingDocblockParamType>
-  </file>
   <file src="apps/workflowengine/lib/Check/AbstractStringCheck.php">
     <NullArgument occurrences="1">
       <code>null</code>
@@ -2503,6 +2495,9 @@
     <InvalidScalarArgument occurrences="1">
       <code>$levelNum</code>
     </InvalidScalarArgument>
+    <TypeDoesNotContainType occurrences="1">
+      <code>$identifier === false</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="core/Command/Maintenance/DataFingerprint.php">
     <InvalidScalarArgument occurrences="1">
@@ -2561,11 +2556,6 @@
       <code>1</code>
     </InvalidScalarArgument>
   </file>
-  <file src="core/Command/User/Setting.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$input-&gt;getOption('default-value')</code>
-    </InvalidScalarArgument>
-  </file>
   <file src="core/Controller/ClientFlowLoginV2Controller.php">
     <TypeDoesNotContainType occurrences="1">
       <code>!is_string($stateToken)</code>
@@ -2874,8 +2864,11 @@
     </MoreSpecificImplementedParamType>
   </file>
   <file src="lib/private/AppFramework/Utility/SimpleContainer.php">
-    <UndefinedMethod occurrences="1">
+    <UndefinedMethod occurrences="4">
       <code>getName</code>
+      <code>isBuiltin</code>
+      <code>isBuiltin</code>
+      <code>isBuiltin</code>
     </UndefinedMethod>
   </file>
   <file src="lib/private/Archive/TAR.php">
diff --git a/composer.json b/composer.json
index ab69a0fb376..fe27a1928a0 100644
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,7 @@
 		"cs:fix": "php-cs-fixer fix",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/stubs/*' -print0 | xargs -0 -n1 php -l",
-		"psalm": "psalm"
+		"psalm": "psalm",
+		"psalm:update-baseline": "psalm --update-baseline --set-baseline=build/psalm-baseline.xml"
 	}
 }