diff --git a/packages/nc-gui/assets/img/loyalty-bg.png b/packages/nc-gui/assets/img/loyalty-bg.png
new file mode 100644
index 0000000000..e691abbad5
Binary files /dev/null and b/packages/nc-gui/assets/img/loyalty-bg.png differ
diff --git a/packages/nc-gui/assets/img/upgrade-bg.png b/packages/nc-gui/assets/img/upgrade-bg.png
new file mode 100644
index 0000000000..77582f7660
Binary files /dev/null and b/packages/nc-gui/assets/img/upgrade-bg.png differ
diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index b2c816afb5..a94ab6c7b8 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -1340,10 +1340,6 @@ svg.nc-virtual-cell-icon {
   }
 }
 
-.nc-upgrade-plan-btn {
-  @apply !bg-nc-fill-maroon-medium !hover:bg-nc-fill-maroon-dark;
-}
-
 .nc-cell-field {
   &.nc-text-transparent {
     @apply text-transparent;
diff --git a/packages/nc-gui/components/dashboard/Sidebar/Header.vue b/packages/nc-gui/components/dashboard/Sidebar/Header.vue
index c11d24b3dc..abcd3c9fff 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/Header.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/Header.vue
@@ -3,7 +3,7 @@ const workspaceStore = useWorkspace()
 
 const { isLeftSidebarOpen } = storeToRefs(useSidebarStore())
 
-const { activeWorkspace, isWorkspaceLoading } = storeToRefs(workspaceStore)
+const { activeWorkspace, isWorkspacesLoading } = storeToRefs(workspaceStore)
 
 const { activeViewTitleOrId } = storeToRefs(useViewsStore())
 
@@ -20,7 +20,7 @@ const showSidebarBtn = computed(() => !(isMobileMode.value && !activeViewTitleOr
     :data-workspace-title="activeWorkspace?.title"
     style="height: var(--topbar-height)"
   >
-    <div v-if="!isWorkspaceLoading" class="flex flex-row items-center w-full">
+    <div v-if="!isWorkspacesLoading" class="flex flex-row items-center w-full">
       <WorkspaceMenu />
 
       <div class="flex flex-grow min-w-1"></div>
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 08179054a1..f1b52db548 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -254,25 +254,18 @@ const isDeleteOrUpdateAllowed = (user) => {
                   })
                 "
               >
-                <NcBadge
-                  :border="false"
-                  color="grey"
-                  class="!bg-nc-bg-gray-medium text-nc-content-gray-default text-sm !h-[20px] !rounded-md truncate"
-                >
+                <div class="flex items-center text-nc-content-gray-default text-sm">
                   <GeneralIcon icon="star" class="flex-none h-4 w-4 mr-1" />
 
                   {{ paidUsersCount }} {{ paidUsersCount === 1 ? $t('labels.editorSeat') : $t('labels.editorSeats') }}
-                </NcBadge>
+                </div>
               </NcTooltip>
-              <NcBadge
-                v-else
-                :border="false"
-                color="maroon"
-                class="text-nc-content-maroon-dark text-sm !h-[20px] font-500 whitespace-nowrap"
-              >
+              <div v-else class="flex items-center text-nc-content-gray-default text-sm">
+                <GeneralIcon icon="star" class="flex-none h-4 w-4 mr-1" />
+
                 {{ paidUsersCount }} {{ $t('general.paid') }}
                 {{ paidUsersCount === 1 ? $t('general.seat').toLowerCase() : $t('general.seats').toLowerCase() }}
-              </NcBadge>
+              </div>
               <div class="self-stretch border-r-1 border-nc-border-gray-medium"></div>
             </template>
 
@@ -350,7 +343,7 @@ const isDeleteOrUpdateAllowed = (user) => {
               <div v-if="column.key === 'email'" class="w-full flex gap-3 items-center">
                 <GeneralUserIcon size="base" :user="record" class="flex-none" />
                 <div class="flex flex-col flex-1 max-w-[calc(100%_-_44px)]">
-                  <div class="flex items-center gap-3">
+                  <div class="flex items-center gap-1">
                     <NcTooltip class="truncate max-w-full text-gray-800 capitalize font-semibold" show-on-truncate-only>
                       <template #title>
                         {{ record.display_name || record.email.slice(0, record.email.indexOf('@')) }}
@@ -364,19 +357,14 @@ const isDeleteOrUpdateAllowed = (user) => {
                       :tooltip-style="{ width: '180px' }"
                       :overlay-inner-style="{ width: '180px' }"
                     >
-                      <NcBadge
-                        v-if="activePlanTitle === PlanTitles.FREE"
-                        :border="false"
-                        color="grey"
-                        class="!bg-nc-bg-gray-medium text-nc-content-gray-default !h-[20px] !w-[20px] !p-0.5 !rounded"
-                      >
-                        <GeneralIcon icon="star" class="flex-none h-4 w-4" />
-                      </NcBadge>
+                      <div v-if="activePlanTitle === PlanTitles.FREE" class="text-nc-content-gray-default">
+                        <GeneralIcon icon="star" class="flex-none mb-0.5" />
+                      </div>
                       <NcBadge
                         v-else
                         :border="false"
-                        color="maroon"
-                        class="text-nc-content-maroon-dark text-[10px] leading-[14px] !h-[18px] font-semibold"
+                        color="green"
+                        class="text-nc-content-green-dark text-[10px] leading-[14px] !h-[18px] font-semibold"
                       >
                         {{ $t('general.paid') }}
                       </NcBadge>
diff --git a/packages/nc-gui/components/workspace/Sso.vue b/packages/nc-gui/components/workspace/Sso.vue
new file mode 100644
index 0000000000..b95f1483e9
--- /dev/null
+++ b/packages/nc-gui/components/workspace/Sso.vue
@@ -0,0 +1,3 @@
+<template>
+  <span></span>
+</template>
diff --git a/packages/nc-gui/components/workspace/View.vue b/packages/nc-gui/components/workspace/View.vue
index b1cb8c9411..b942e3128d 100644
--- a/packages/nc-gui/components/workspace/View.vue
+++ b/packages/nc-gui/components/workspace/View.vue
@@ -18,11 +18,12 @@ const workspaceStore = useWorkspace()
 const { loadRoles } = useRoles()
 const { activeWorkspace: _activeWorkspace, workspaces, deletingWorkspace } = storeToRefs(workspaceStore)
 const { loadCollaborators, loadWorkspace } = workspaceStore
+const { appInfo } = useGlobal()
 
 const orgStore = useOrg()
 const { orgId, org } = storeToRefs(orgStore)
 
-const { isWsAuditEnabled, handleUpgradePlan, isPaymentEnabled } = useEeConfig()
+const { isWsAuditEnabled, handleUpgradePlan, isPaymentEnabled, getFeature } = useEeConfig()
 
 const currentWorkspace = computedAsync(async () => {
   if (deletingWorkspace.value) return
@@ -60,6 +61,13 @@ const tab = computed({
   },
 })
 
+const isWorkspaceSsoAvail = computed(() => {
+  if (isEeUI && appInfo.value?.isCloud && getFeature(PlanFeatureTypes.FEATURE_SSO)) {
+    return true
+  }
+  return false
+})
+
 watch(
   () => currentWorkspace.value?.title,
   (title) => {
@@ -227,6 +235,7 @@ watch(
 :deep(.ant-tabs-nav) {
   @apply !pl-0;
 }
+
 :deep(.ant-tabs-tab) {
   @apply pt-2 pb-3;
 }
@@ -234,9 +243,11 @@ watch(
 .ant-tabs-content-top {
   @apply !h-full;
 }
+
 .tab-info {
   @apply flex pl-1.25 px-1.5 py-0.75 rounded-md text-xs;
 }
+
 .tab-title {
   @apply flex flex-row items-center gap-x-2 py-[1px];
 }
diff --git a/packages/nc-gui/components/workspace/integrations/forms/EditOrAdd/Common/index.vue b/packages/nc-gui/components/workspace/integrations/forms/EditOrAdd/Common/index.vue
index 4cd90ae161..6e7aef86b2 100644
--- a/packages/nc-gui/components/workspace/integrations/forms/EditOrAdd/Common/index.vue
+++ b/packages/nc-gui/components/workspace/integrations/forms/EditOrAdd/Common/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { IntegrationCategoryType, SyncDataType, clientTypes as _clientTypes } from '#imports'
+import { type IntegrationCategoryType, SyncDataType, type clientTypes as _clientTypes } from '#imports'
 
 const props = defineProps<{
   open: boolean
@@ -104,7 +104,11 @@ onMounted(async () => {
       </div>
     </template>
   </WorkspaceIntegrationsFormsEditOrAddCommonWrapper>
-  <WorkspaceIntegrationsConnect v-if="activeIntegration" v-bind="props" @update:open="vOpen = $event" />
+  <WorkspaceIntegrationsConnect
+    v-if="activeIntegration && activeIntegration.sub_type === SyncDataType.NOCODB"
+    v-bind="props"
+    @update:open="vOpen = $event"
+  />
   <div v-else></div>
 </template>
 
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 342d5329ac..69fb8bbdac 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -9572,6 +9572,37 @@ export class Api<
       }),
 
     /**
+     * @description Get the number of groups by the given query
+     *
+     * @tags DB Table Row
+     * @name GroupByCount
+     * @summary Group By Table Row Count
+     * @request GET:/api/v1/db/data/{orgs}/{baseName}/{tableName}/groupby/count
+     * @response `200` `FieldOptionsButtonV3Type` OK
+     */
+    groupByCount: (
+      orgs: string,
+      baseName: string,
+      tableName: string,
+      query?: {
+        /** Column name of the column you want to group by, eg. `column_name=column1` */
+        column_name?: string;
+        sort?: any[];
+        where?: string;
+        /** @min 0 */
+        offset?: number;
+      },
+      params: RequestParams = {}
+    ) =>
+      this.request<FieldOptionsButtonV3Type, any>({
+        path: `/api/v1/db/data/${orgs}/${baseName}/${tableName}/groupby/count`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
  * @description Get the grouped data By Column ID. Used in Kanban View.
  * 
  * @tags DB Table Row
@@ -10460,6 +10491,49 @@ export class Api<
         ...params,
       }),
 
+    /**
+ * @description Get the table view rows grouped by count the given query
+ * 
+ * @tags DB View Row
+ * @name GroupByCount
+ * @summary Count of Group By Table View Row
+ * @request GET:/api/v1/db/data/{orgs}/{baseName}/{tableName}/views/{viewName}/groupby/count
+ * @response `200` `FieldOptionsButtonV3Type` OK
+ * @response `400` `{
+  \** @example BadRequest [Error]: <ERROR MESSAGE> *\
+  msg: string,
+
+}`
+ */
+    groupByCount: (
+      orgs: string,
+      baseName: string,
+      tableName: string,
+      viewName: string,
+      query?: {
+        /** Column name of the column you want to group by, eg. `column_name=column1` */
+        column_name?: string;
+        sort?: any[];
+        where?: string;
+        /** @min 0 */
+        offset?: number;
+      },
+      params: RequestParams = {}
+    ) =>
+      this.request<
+        FieldOptionsButtonV3Type,
+        {
+          /** @example BadRequest [Error]: <ERROR MESSAGE> */
+          msg: string;
+        }
+      >({
+        path: `/api/v1/db/data/${orgs}/${baseName}/${tableName}/views/${viewName}/groupby/count`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
     /**
  * @description Count how many rows in the given Table View
  * 
@@ -11285,6 +11359,48 @@ export class Api<
         ...params,
       }),
 
+    /**
+ * @description Get the number of groups by the given query
+ * 
+ * @tags Public
+ * @name DataGroupByCount
+ * @summary Group By Table Row Count
+ * @request GET:/api/v2/public/shared-view/{sharedViewUuid}/groupby/count
+ * @response `200` `FieldOptionsButtonV3Type` OK
+ * @response `400` `{
+  \** @example BadRequest [Error]: <ERROR MESSAGE> *\
+  msg: string,
+
+}`
+ */
+    dataGroupByCount: (
+      sharedViewUuid: string,
+      query?: {
+        /** The result will be sorted based on `sort` query */
+        sort?: string[] | string;
+        /** Extra filtering */
+        where?: string;
+        /** Used for multiple filter queries */
+        filterArrJson?: string;
+        /** Columns to group by */
+        column_name?: string;
+      },
+      params: RequestParams = {}
+    ) =>
+      this.request<
+        FieldOptionsButtonV3Type,
+        {
+          /** @example BadRequest [Error]: <ERROR MESSAGE> */
+          msg: string;
+        }
+      >({
+        path: `/api/v2/public/shared-view/${sharedViewUuid}/groupby/count`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
     /**
  * @description List all nested list data in a given shared view
  * 
diff --git a/packages/nocodb/src/app.module.ts b/packages/nocodb/src/app.module.ts
index 4c71fffeaf..fcf8cea8d9 100644
--- a/packages/nocodb/src/app.module.ts
+++ b/packages/nocodb/src/app.module.ts
@@ -19,6 +19,7 @@ import { RawBodyMiddleware } from '~/middlewares/raw-body.middleware';
 import { JsonBodyMiddleware } from '~/middlewares/json-body.middleware';
 
 import { packageInfo } from '~/utils/packageVersion';
+import { UrlEncodeMiddleware } from '~/middlewares/url-encode.middleware';
 
 export const ceModuleConfig = {
   imports: [
@@ -68,6 +69,8 @@ export class AppModule {
       })
       .apply(JsonBodyMiddleware)
       .forRoutes('*')
+      .apply(UrlEncodeMiddleware)
+      .forRoutes('*')
       .apply(GuiMiddleware)
       .forRoutes({ path: `${dashboardPath}*`, method: RequestMethod.GET })
       .apply(GlobalMiddleware)
diff --git a/packages/nocodb/src/meta/meta.service.ts b/packages/nocodb/src/meta/meta.service.ts
index 97e30a5170..a2572a3bc9 100644
--- a/packages/nocodb/src/meta/meta.service.ts
+++ b/packages/nocodb/src/meta/meta.service.ts
@@ -653,6 +653,7 @@ export class MetaService {
     xcCondition?: Condition,
     skipUpdatedAt = false,
     force = false,
+    allowCreatedAt = false,
   ): Promise<any> {
     const query = this.knexConnection(target);
 
@@ -679,7 +680,9 @@ export class MetaService {
       }
     }
 
-    delete data.created_at;
+    if (!allowCreatedAt) {
+      delete data.created_at;
+    }
 
     if (!skipUpdatedAt) {
       data.updated_at = this.now();
diff --git a/packages/nocodb/src/middlewares/url-encode.middleware.ts b/packages/nocodb/src/middlewares/url-encode.middleware.ts
new file mode 100644
index 0000000000..0e32b86892
--- /dev/null
+++ b/packages/nocodb/src/middlewares/url-encode.middleware.ts
@@ -0,0 +1,12 @@
+import { Injectable } from '@nestjs/common';
+import * as express from 'express';
+import type { NestMiddleware } from '@nestjs/common';
+
+@Injectable()
+export class UrlEncodeMiddleware implements NestMiddleware {
+  constructor() {}
+
+  use(req: any, res: any, next: () => void) {
+    express.urlencoded({ extended: true })(req, res, next);
+  }
+}
diff --git a/packages/nocodb/src/providers/init-meta-service.provider.ts b/packages/nocodb/src/providers/init-meta-service.provider.ts
index bd0982483c..1ff9d61955 100644
--- a/packages/nocodb/src/providers/init-meta-service.provider.ts
+++ b/packages/nocodb/src/providers/init-meta-service.provider.ts
@@ -133,7 +133,11 @@ export const InitMetaServiceProvider: FactoryProvider = {
     NcDebug.log('Plugin manager initialized');
 
     if (process.env.NC_CLOUD === 'true') {
-      await populatePluginsForCloud({ ncMeta: Noco.ncMeta });
+      try {
+        await populatePluginsForCloud({ ncMeta: Noco.ncMeta });
+      } catch (e) {
+        if (process.env.NODE_ENV !== 'test') throw e;
+      }
     }
     T.init({
       instance: getInstance,
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index bb1804b4a7..04588dce70 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -3855,7 +3855,7 @@ export class ColumnsService implements IColumnsService {
           // todo: sanitize
           mm: true,
           columns: associateTableCols,
-          user_id: param.user.id,
+          user_id: param.user?.id,
         },
       );
 
diff --git a/packages/nocodb/src/utils/index.ts b/packages/nocodb/src/utils/index.ts
index c912d4d3c0..815d15267a 100644
--- a/packages/nocodb/src/utils/index.ts
+++ b/packages/nocodb/src/utils/index.ts
@@ -11,3 +11,4 @@ export * from './processUtils';
 
 export const isEE = false;
 export const isOnPrem = false;
+export const isCloud = false;