9 files changed, 17 insertions, 4 deletions
diff --git a/lib/l10n/bg.js b/lib/l10n/bg.js
index 09a844026a4..445da4c9626 100644
--- a/lib/l10n/bg.js
+++ b/lib/l10n/bg.js
@@ -92,6 +92,7 @@ OC.L10N.register(
     "Administration settings" : "Административни настройки",
     "Settings" : "Настройки",
     "Log out" : "Отписване",
+    "Accounts" : "Профили",
     "Email" : "Имейл",
     "Mail %s" : "Поща %s",
     "Fediverse" : "Fediverse /съвкупност от обединени сървъри/",
diff --git a/lib/l10n/bg.json b/lib/l10n/bg.json
index 18407fe8356..a4bc3162762 100644
--- a/lib/l10n/bg.json
+++ b/lib/l10n/bg.json
@@ -90,6 +90,7 @@
     "Administration settings" : "Административни настройки",
     "Settings" : "Настройки",
     "Log out" : "Отписване",
+    "Accounts" : "Профили",
     "Email" : "Имейл",
     "Mail %s" : "Поща %s",
     "Fediverse" : "Fediverse /съвкупност от обединени сървъри/",
diff --git a/lib/l10n/sw.js b/lib/l10n/sw.js
index ddcc74ef517..baef028baf7 100644
--- a/lib/l10n/sw.js
+++ b/lib/l10n/sw.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "File already exists" : "Faili lipo tayari",
     "Settings" : "Mipangilio",
     "Email" : "Barua pepe",
+    "Additional settings" : "Mipangilio ya nyongeza",
     "Sunday" : "Jumapili",
     "Monday" : "Jumatatu",
     "Tuesday" : "Jumanne",
diff --git a/lib/l10n/sw.json b/lib/l10n/sw.json
index 3f81b601398..bc299dcef06 100644
--- a/lib/l10n/sw.json
+++ b/lib/l10n/sw.json
@@ -4,6 +4,7 @@
     "File already exists" : "Faili lipo tayari",
     "Settings" : "Mipangilio",
     "Email" : "Barua pepe",
+    "Additional settings" : "Mipangilio ya nyongeza",
     "Sunday" : "Jumapili",
     "Monday" : "Jumatatu",
     "Tuesday" : "Jumanne",
diff --git a/lib/private/Files/ObjectStore/S3ConfigTrait.php b/lib/private/Files/ObjectStore/S3ConfigTrait.php
index 63f14ac2d00..5b086db8f77 100644
--- a/lib/private/Files/ObjectStore/S3ConfigTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConfigTrait.php
@@ -18,6 +18,10 @@ trait S3ConfigTrait {
 	/** Maximum number of concurrent multipart uploads */
 	protected int $concurrency;
 
+	/** Timeout, in seconds, for the connection to S3 server, not for the
+	 *  request. */
+	protected float $connectTimeout;
+
 	protected int $timeout;
 
 	protected string|false $proxy;
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index b7017583dc2..062d2e4bde4 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -39,6 +39,7 @@ trait S3ConnectionTrait {
 		// Default to 5 like the S3 SDK does
 		$this->concurrency = $params['concurrency'] ?? 5;
 		$this->proxy = $params['proxy'] ?? false;
+		$this->connectTimeout = $params['connect_timeout'] ?? 5;
 		$this->timeout = $params['timeout'] ?? 15;
 		$this->storageClass = !empty($params['storageClass']) ? $params['storageClass'] : 'STANDARD';
 		$this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
@@ -102,8 +103,7 @@ trait S3ConnectionTrait {
 			'use_arn_region' => false,
 			'http' => [
 				'verify' => $this->getCertificateBundlePath(),
-				// Timeout for the connection to S3 server, not for the request.
-				'connect_timeout' => 5
+				'connect_timeout' => $this->connectTimeout,
 			],
 			'use_aws_shared_config_files' => false,
 			'retries' => [
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 5ca97b261f4..b84c001a200 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -199,6 +199,7 @@ use OCP\Log\ILogFactory;
 use OCP\Mail\IMailer;
 use OCP\OCM\ICapabilityAwareOCMProvider;
 use OCP\OCM\IOCMDiscoveryService;
+use OCP\OCM\IOCMProvider;
 use OCP\Preview\IMimeIconProvider;
 use OCP\Profile\IProfileManager;
 use OCP\Profiler\IProfiler;
@@ -1273,6 +1274,7 @@ class Server extends ServerContainer implements IServerContainer {
 		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
 		$this->registerAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
 		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php
index eec5c6e83e9..2cf976ce90a 100644
--- a/lib/public/AppFramework/App.php
+++ b/lib/public/AppFramework/App.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
  */
 namespace OCP\AppFramework;
 
+use OC\AppFramework\Utility\SimpleContainer;
 use OC\ServerContainer;
 use OCP\IConfig;
 use OCP\Server;
@@ -70,9 +71,10 @@ class App {
 					$setUpViaQuery = true;
 					break;
 				} elseif (isset($step['class'], $step['function'], $step['args'][0]) &&
-					$step['class'] === \ReflectionClass::class &&
-					$step['function'] === 'initializeLazyObject' &&
+					$step['class'] === SimpleContainer::class &&
+					preg_match('/{closure:OC\\\\AppFramework\\\\Utility\\\\SimpleContainer::buildClass\\(\\):\\d+}/', $step['function']) &&
 					$step['args'][0] === $this) {
+					/* We are setup through a lazy ghost, fine */
 					$setUpViaQuery = true;
 					break;
 				}
diff --git a/lib/public/OCM/IOCMProvider.php b/lib/public/OCM/IOCMProvider.php
index a267abc52d2..7141b0a9ab9 100644
--- a/lib/public/OCM/IOCMProvider.php
+++ b/lib/public/OCM/IOCMProvider.php
@@ -16,6 +16,7 @@ use OCP\OCM\Exceptions\OCMProviderException;
  * Model based on the Open Cloud Mesh Discovery API
  * @link https://github.com/cs3org/OCM-API/
  * @since 28.0.0
+ * @deprecated 32.0.0 Please use {@see \OCP\OCM\ICapabilityAwareOCMProvider}
  */
 interface IOCMProvider extends JsonSerializable {
 	/**