Merge branch 'develop' into feature/login-nextjs

config/appsettings.json

@@ -218,7 +218,10 @@
   },
   "thumbnail": {
     "maxDegreeOfParallelism": 1,
-    "sizes": [{ "height": 720, "width": 1280, "resizeMode": "Max" }]
+    "sizes": [
+       { "height": 720, "width": 1280, "resizeMode": "Manual" },
+       { "height": 2160, "width": 3840, "resizeMode": "Manual" }
+	]
   },
   "csp": {
     "default": {

config/storage.json

@@ -87,7 +87,8 @@
         "type": "disc",
         "path": "$STORAGE_ROOT\\Studio\\{0}\\CoBranding",
         "virtualpath": "~/studio/{0}/cobranding",
-        "public": true
+        "public": true,
+        "contentAsAttachment": true
       },
       {
         "name": "static_partnerdata",

install/common/product-configuration

@@ -625,7 +625,10 @@ setup_enterprise() {
 change_elasticsearch_config(){
 
 	systemctl stop opensearch
-	systemctl is-active --quiet elasticsearch && systemctl stop elasticsearch
+	if $PACKAGE_MANAGER elasticsearch >/dev/null 2>&1; then
+		systemctl disable elasticsearch >/dev/null 2>&1
+		systemctl stop elasticsearch >/dev/null 2>&1
+	fi
 
 	sed -i '/^plugins\.security/d' /etc/opensearch/opensearch.yml
 	sed -i '/CN=kirk,OU=client,O=client,L=test, C=de/d' /etc/opensearch/opensearch.yml