diff --git a/.github/workflows/preview-service-acceptance.yml b/.github/workflows/preview-service-acceptance.yml
index 5c707144e..aaea1b056 100644
--- a/.github/workflows/preview-service-acceptance.yml
+++ b/.github/workflows/preview-service-acceptance.yml
@@ -69,7 +69,7 @@ jobs:
     services:
       postgres:
         # Docker Hub image
-        image: postgres:16.4-bookworm@sha256:91f464e7ba0ad91a106c94cff079fb4384139291b8c0502fd36989cf2c788bbb
+        image: postgres:16.4-bookworm@sha256:e62fbf9d3e2b49816a32c400ed2dba83e3b361e6833e624024309c35d334b412
         env:
           POSTGRES_DB: preview_service_test
           POSTGRES_PASSWORD: preview_service_test
diff --git a/package.json b/package.json
index 911f0a334..93f04f584 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "husky": "^7.0.4",
     "lint-staged": "^12.3.7",
     "lockfile": "^1.0.4",
+    "npkill": "^0.12.2",
     "pino-pretty": "^9.1.1",
     "prettier": "^2.5.1",
     "ts-node": "^10.9.1",
diff --git a/packages/frontend-2/components/auth/PasswordResetPanel.vue b/packages/frontend-2/components/auth/PasswordResetPanel.vue
index 8d8092e70..d72fd678a 100644
--- a/packages/frontend-2/components/auth/PasswordResetPanel.vue
+++ b/packages/frontend-2/components/auth/PasswordResetPanel.vue
@@ -1,6 +1,8 @@
 <template>
   <form class="mx-auto w-full px-2" @submit="onSubmit">
-    <h1 class="text-heading-xl text-center inline-block mb-4">Reset your password</h1>
+    <h1 class="text-heading-xl text-center inline-block mb-4 w-full">
+      Reset your password
+    </h1>
     <div class="flex flex-col space-y-4 text-body-xs">
       <div>
         Type in the email address you used, so we can verify your account. We will send
@@ -20,10 +22,10 @@
 
     <div class="flex flex-col gap-y-2 mt-4">
       <FormButton submit full-width size="lg" :disabled="loading">
-        Send password reset email
+        Send reset email
       </FormButton>
       <FormButton color="outline" size="lg" full-width :to="homeRoute">
-        Go home
+        Back to login
       </FormButton>
     </div>
   </form>
diff --git a/packages/frontend-2/components/auth/RegisterPanel.vue b/packages/frontend-2/components/auth/RegisterPanel.vue
index 762bd1313..5f9ade8ec 100644
--- a/packages/frontend-2/components/auth/RegisterPanel.vue
+++ b/packages/frontend-2/components/auth/RegisterPanel.vue
@@ -8,13 +8,13 @@
       </div>
       <AuthWorkspaceInviteHeader v-else :invite="workspaceInvite" />
       <template v-if="isInviteOnly && !inviteToken">
-        <div class="flex space-x-2 items-center">
-          <ExclamationTriangleIcon class="h-8 w-8 text-warning" />
-          <div>
-            This server is invite only. If you have received an invitation email, please
-            follow the instructions in it.
-          </div>
-        </div>
+        <CommonAlert color="warning">
+          <template #title>This server is invite only</template>
+          <template #description>
+            If you have received an invitation email, please follow the instructions in
+            it.
+          </template>
+        </CommonAlert>
         <div
           v-if="!inviteEmail"
           class="flex gap-1 text-foregound-3 text-body-xs items-center justify-center"
@@ -56,7 +56,6 @@ import { useQuery } from '@vue/apollo-composable'
 import { AuthStrategy } from '~~/lib/auth/helpers/strategies'
 import { useLoginOrRegisterUtils } from '~~/lib/auth/composables/auth'
 import { graphql } from '~~/lib/common/generated/gql'
-import { ExclamationTriangleIcon } from '@heroicons/vue/24/outline'
 import { loginRoute } from '~~/lib/common/helpers/route'
 import { authRegisterPanelQuery } from '~/lib/auth/graphql/queries'
 
diff --git a/packages/frontend-2/components/auth/sso/Login.vue b/packages/frontend-2/components/auth/sso/Login.vue
index a53516201..e8b261e49 100644
--- a/packages/frontend-2/components/auth/sso/Login.vue
+++ b/packages/frontend-2/components/auth/sso/Login.vue
@@ -23,7 +23,6 @@
 
       <AuthSsoWorkspaceSelect
         v-if="shouldShowWorkspaceSelector"
-        v-model="values.workspace"
         :items="availableWorkspaces"
         :disabled="loading"
       />
diff --git a/packages/frontend-2/components/viewer/Controls.vue b/packages/frontend-2/components/viewer/Controls.vue
index 924509d71..46992ab65 100644
--- a/packages/frontend-2/components/viewer/Controls.vue
+++ b/packages/frontend-2/components/viewer/Controls.vue
@@ -2,7 +2,7 @@
 <template>
   <div v-if="showControls">
     <div
-      class="absolute z-20 flex max-h-screen simple-scrollbar flex-col space-y-1 md:space-y-2 bg-green-300/0 px-2"
+      class="absolute z-20 flex max-h-screen simple-scrollbar flex-col space-y-1 md:space-y-2 px-2"
       :class="
         showNavbar && !isEmbedEnabled
           ? 'pt-[3.8rem]'
diff --git a/packages/frontend-2/lib/common/composables/serverInfo.ts b/packages/frontend-2/lib/common/composables/serverInfo.ts
index 85f39fd3b..36506baab 100644
--- a/packages/frontend-2/lib/common/composables/serverInfo.ts
+++ b/packages/frontend-2/lib/common/composables/serverInfo.ts
@@ -27,10 +27,12 @@ export const useServerInfoScopes = () => {
   const scopes = computed(() => {
     const base = result.value?.serverInfo.scopes || []
     const cloned = cloneDeep(base) // cause it might get directly plopped back into the cache by a dev
-    return cloned.map((scope) => ({
-      ...scope,
-      name: scope.name as unknown as (typeof AllScopes)[number]
-    }))
+    return cloned
+      .map((scope) => ({
+        ...scope,
+        name: scope.name as unknown as (typeof AllScopes)[number]
+      }))
+      .sort((a, b) => a.name.localeCompare(b.name))
   })
 
   return {
diff --git a/packages/frontend-2/lib/common/generated/gql/graphql.ts b/packages/frontend-2/lib/common/generated/gql/graphql.ts
index 0fb861804..7aca92746 100644
--- a/packages/frontend-2/lib/common/generated/gql/graphql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/graphql.ts
@@ -538,6 +538,12 @@ export type BranchUpdateInput = {
   streamId: Scalars['String']['input'];
 };
 
+export type BulkUsersRetrievalInput = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  emails: Array<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+};
+
 export type CancelCheckoutSessionInput = {
   sessionId: Scalars['ID']['input'];
   workspaceId: Scalars['ID']['input'];
@@ -1052,6 +1058,7 @@ export type LimitedUser = {
   totalOwnedStreamsFavorites: Scalars['Int']['output'];
   verified?: Maybe<Scalars['Boolean']['output']>;
   workspaceDomainPolicyCompliant?: Maybe<Scalars['Boolean']['output']>;
+  workspaceRole?: Maybe<Scalars['String']['output']>;
 };
 
 
@@ -1108,6 +1115,15 @@ export type LimitedUserWorkspaceDomainPolicyCompliantArgs = {
   workspaceId?: InputMaybe<Scalars['String']['input']>;
 };
 
+
+/**
+ * Limited user type, for showing public info about a user
+ * to another user
+ */
+export type LimitedUserWorkspaceRoleArgs = {
+  workspaceId?: InputMaybe<Scalars['String']['input']>;
+};
+
 /** Workspace metadata visible to non-workspace members. */
 export type LimitedWorkspace = {
   __typename?: 'LimitedWorkspace';
@@ -2578,6 +2594,8 @@ export type Query = {
   userSearch: UserSearchResultCollection;
   /** Look up server users */
   users: UserSearchResultCollection;
+  /** Look up server users with a collection of emails */
+  usersByEmail: Array<Maybe<LimitedUser>>;
   /** Validates the slug, to make sure it contains only valid characters and its not taken. */
   validateWorkspaceSlug: Scalars['Boolean']['output'];
   workspace: Workspace;
@@ -2724,6 +2742,11 @@ export type QueryUsersArgs = {
 };
 
 
+export type QueryUsersByEmailArgs = {
+  input: BulkUsersRetrievalInput;
+};
+
+
 export type QueryValidateWorkspaceSlugArgs = {
   slug: Scalars['String']['input'];
 };
@@ -7282,6 +7305,7 @@ export type LimitedUserFieldArgs = {
   totalOwnedStreamsFavorites: {},
   verified: {},
   workspaceDomainPolicyCompliant: LimitedUserWorkspaceDomainPolicyCompliantArgs,
+  workspaceRole: LimitedUserWorkspaceRoleArgs,
 }
 export type LimitedWorkspaceFieldArgs = {
   defaultLogoIndex: {},
@@ -7624,6 +7648,7 @@ export type QueryFieldArgs = {
   userPwdStrength: QueryUserPwdStrengthArgs,
   userSearch: QueryUserSearchArgs,
   users: QueryUsersArgs,
+  usersByEmail: QueryUsersByEmailArgs,
   validateWorkspaceSlug: QueryValidateWorkspaceSlugArgs,
   workspace: QueryWorkspaceArgs,
   workspaceBySlug: QueryWorkspaceBySlugArgs,
diff --git a/packages/frontend-2/lib/common/helpers/graphql.ts b/packages/frontend-2/lib/common/helpers/graphql.ts
index 18ae0d9e3..bbbb09ee8 100644
--- a/packages/frontend-2/lib/common/helpers/graphql.ts
+++ b/packages/frontend-2/lib/common/helpers/graphql.ts
@@ -9,10 +9,11 @@ import type {
   TypedDocumentNode,
   ServerError,
   ServerParseError,
-  ApolloCache
+  ApolloCache,
+  Unmasked
 } from '@apollo/client/core'
 import { GraphQLError } from 'graphql'
-import type { DocumentNode } from 'graphql'
+import type { DocumentNode, GraphQLFormattedError } from 'graphql'
 import {
   flatten,
   has,
@@ -27,7 +28,7 @@ import {
 } from 'lodash-es'
 import type { Modifier, ModifierDetails, Reference } from '@apollo/client/cache'
 import type { Get, PartialDeep, Paths, ReadonlyDeep, Tagged } from 'type-fest'
-import type { GraphQLErrors, NetworkError } from '@apollo/client/errors'
+import type { NetworkError } from '@apollo/client/errors'
 import { nanoid } from 'nanoid'
 import { StackTrace } from '~~/lib/common/helpers/debugging'
 import dayjs from 'dayjs'
@@ -117,7 +118,7 @@ export function isInvalidAuth(error: ApolloError | NetworkError) {
 export function convertThrowIntoFetchResult(
   err: unknown
 ): FetchResult<undefined> & { apolloError?: ApolloError; isInvalidAuth: boolean } {
-  let gqlErrors: readonly GraphQLError[]
+  let gqlErrors: readonly GraphQLFormattedError[]
   let apolloError: Optional<ApolloError> = undefined
   if (err instanceof ApolloError) {
     gqlErrors = err.graphQLErrors
@@ -154,7 +155,7 @@ export function convertThrowIntoFetchResult(
  * Get first error message from a GQL errors array
  */
 export function getFirstErrorMessage(
-  errs: readonly GraphQLError[] | undefined | null,
+  errs: readonly GraphQLError[] | readonly GraphQLFormattedError[] | undefined | null,
   fallbackMessage = 'An unexpected issue occurred'
 ): string {
   return errs?.[0]?.message || fallbackMessage
@@ -176,7 +177,7 @@ export function updateCacheByFilter<TData, TVariables = unknown>(
    * mutate anything being passed into this function! E.g. if you want to mutate arrays,
    * create new arrays through slice()/filter() instead
    */
-  updater: (data: TData) => TData | undefined,
+  updater: (data: Unmasked<TData>) => Unmasked<TData> | undefined,
   options: Partial<{
     /**
      * Whether to suppress errors that occur when the fragment being queried
@@ -203,7 +204,7 @@ export function updateCacheByFilter<TData, TVariables = unknown>(
     )
   }
 
-  const readData = (): TData | null => {
+  const readData = (): Unmasked<TData> | null => {
     if (fragment) {
       return cache.readFragment(fragment)
     } else if (query) {
@@ -213,7 +214,7 @@ export function updateCacheByFilter<TData, TVariables = unknown>(
     }
   }
 
-  const writeData = (data: TData): boolean => {
+  const writeData = (data: Unmasked<TData>): boolean => {
     if (fragment) {
       cache.writeFragment({ ...fragment, data, overwrite })
       return true
@@ -486,7 +487,9 @@ export function evictObjectFields<
   )
 }
 
-export const resolveGenericStatusCode = (errors: GraphQLErrors) => {
+export const resolveGenericStatusCode = (
+  errors: readonly GraphQLError[] | readonly GraphQLFormattedError[]
+) => {
   if (errors.some((e) => e.extensions?.code === 'FORBIDDEN')) return 403
   if (
     errors.some((e) =>
@@ -508,7 +511,10 @@ export const resolveGenericStatusCode = (errors: GraphQLErrors) => {
   return 500
 }
 
-export const errorFailedAtPathSegment = (error: GraphQLError, segment: string) => {
+export const errorFailedAtPathSegment = (
+  error: GraphQLError | GraphQLFormattedError,
+  segment: string
+) => {
   const path = error.path || []
   return path[path.length - 1] === segment
 }
diff --git a/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts b/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts
index 26ff1f704..2c042355a 100644
--- a/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts
+++ b/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts
@@ -18,7 +18,6 @@ import {
 } from '@speckle/viewer'
 import { useAuthCookie } from '~~/lib/auth/composables/auth'
 import type {
-  Comment,
   Project,
   ProjectCommentThreadsArgs,
   ViewerResourceItem
@@ -40,10 +39,8 @@ import { useViewerCommentUpdateTracking } from '~~/lib/viewer/composables/commen
 import {
   getCacheId,
   getObjectReference,
-  isReference,
   modifyObjectFields
 } from '~~/lib/common/helpers/graphql'
-import type { ModifyFnCacheData } from '~~/lib/common/helpers/graphql'
 import {
   useViewerOpenedThreadUpdateEmitter,
   useViewerThreadTracking
@@ -60,8 +57,6 @@ import {
 } from '~~/lib/viewer/composables/ui'
 import { onKeyStroke, watchTriggerable } from '@vueuse/core'
 import { setupDebugMode } from '~~/lib/viewer/composables/setup/dev'
-import type { Reference } from '@apollo/client'
-import type { Modifier } from '@apollo/client/cache'
 import { useEmbed } from '~/lib/viewer/composables/setup/embed'
 import { useMixpanel } from '~~/lib/core/composables/mp'
 
@@ -224,7 +219,7 @@ function useViewerSubscriptionEventTracker() {
     (event, cache) => {
       const isArchived = event.type === ProjectCommentsUpdatedMessageType.Archived
       const isNew = event.type === ProjectCommentsUpdatedMessageType.Created
-      const model = event.comment
+      const comment = event.comment
 
       if (isArchived) {
         // Mark as archived
@@ -253,30 +248,21 @@ function useViewerSubscriptionEventTracker() {
             }
           }
         )
-      } else if (isNew && model) {
-        const parentId = model.parent?.id
+      } else if (isNew && comment) {
+        const parentId = comment.parent?.id
 
         // Add reply to parent
         if (parentId) {
-          cache.modify({
-            id: getCacheId('Comment', parentId),
-            fields: {
-              replies: ((
-                oldValue: ModifyFnCacheData<Comment['replies']> | Reference
-              ) => {
-                if (isReference(oldValue)) return oldValue
-
-                const newValue: typeof oldValue = {
-                  totalCount: (oldValue?.totalCount || 0) + 1,
-                  items: [
-                    getObjectReference('Comment', model.id),
-                    ...(oldValue?.items || [])
-                  ]
-                }
-                return newValue
-              }) as Modifier<ModifyFnCacheData<Comment['replies']> | Reference>
-            }
-          })
+          modifyObjectField(
+            cache,
+            getCacheId('Comment', parentId),
+            'replies',
+            ({ helpers: { createUpdatedValue, ref } }) =>
+              createUpdatedValue(({ update }) => {
+                update('totalCount', (totalCount) => totalCount + 1)
+                update('items', (items) => [ref('Comment', comment.id), ...items])
+              })
+          )
         } else {
           // Add comment thread
           modifyObjectFields<ProjectCommentThreadsArgs, Project['commentThreads']>(
@@ -286,7 +272,7 @@ function useViewerSubscriptionEventTracker() {
               if (fieldName !== 'commentThreads') return
 
               const newItems = [
-                getObjectReference('Comment', model.id),
+                getObjectReference('Comment', comment.id),
                 ...(data.items || [])
               ]
               return {
diff --git a/packages/frontend-2/lib/workspaces/composables/management.ts b/packages/frontend-2/lib/workspaces/composables/management.ts
index 581da3216..4d38036ba 100644
--- a/packages/frontend-2/lib/workspaces/composables/management.ts
+++ b/packages/frontend-2/lib/workspaces/composables/management.ts
@@ -31,7 +31,7 @@ import {
   workspaceUpdateRoleMutation
 } from '~/lib/workspaces/graphql/mutations'
 import { isFunction } from 'lodash-es'
-import type { GraphQLError } from 'graphql'
+import type { GraphQLError, GraphQLFormattedError } from 'graphql'
 import { onWorkspaceUpdatedSubscription } from '~/lib/workspaces/graphql/subscriptions'
 import { useLock } from '~/lib/common/composables/singleton'
 import type { Get } from 'type-fest'
@@ -131,7 +131,10 @@ export const useProcessWorkspaceInvite = () => {
       callback: () => MaybeAsync<void>
       preventErrorToasts?:
         | boolean
-        | ((errors: GraphQLError[], errMsg: string) => boolean)
+        | ((
+            errors: GraphQLError[] | GraphQLFormattedError[],
+            errMsg: string
+          ) => boolean)
     }>
   ) => {
     if (!isWorkspacesEnabled.value) return
@@ -253,7 +256,9 @@ export const useWorkspaceInviteManager = <
      */
     preventRedirect: boolean
     route: RouteLocationNormalized
-    preventErrorToasts: boolean | ((errors: GraphQLError[], errMsg: string) => boolean)
+    preventErrorToasts:
+      | boolean
+      | ((errors: GraphQLError[] | GraphQLFormattedError[], errMsg: string) => boolean)
   }>
 ) => {
   const isWorkspacesEnabled = useIsWorkspacesEnabled()
diff --git a/packages/frontend-2/middleware/requireValidAutomation.ts b/packages/frontend-2/middleware/requireValidAutomation.ts
index 15e6d38e4..ec3beb931 100644
--- a/packages/frontend-2/middleware/requireValidAutomation.ts
+++ b/packages/frontend-2/middleware/requireValidAutomation.ts
@@ -35,12 +35,12 @@ export default defineNuxtRouteMiddleware(async (to) => {
 
   if (data?.project?.automations) return
 
-  const isForbidden = (errors || []).find((e) => e.extensions['code'] === 'FORBIDDEN')
+  const isForbidden = (errors || []).find((e) => e.extensions?.['code'] === 'FORBIDDEN')
   const isNotFoundProject = (errors || []).find(
-    (e) => e.extensions['code'] === 'STREAM_NOT_FOUND'
+    (e) => e.extensions?.['code'] === 'STREAM_NOT_FOUND'
   )
   const isNotFoundAutomation = (errors || []).find(
-    (e) => e.extensions['code'] === 'AUTOMATION_NOT_FOUND'
+    (e) => e.extensions?.['code'] === 'AUTOMATION_NOT_FOUND'
   )
   if (isForbidden) {
     return abortNavigation(
diff --git a/packages/frontend-2/middleware/requireValidFunction.ts b/packages/frontend-2/middleware/requireValidFunction.ts
index 4fa159bf4..3675694ec 100644
--- a/packages/frontend-2/middleware/requireValidFunction.ts
+++ b/packages/frontend-2/middleware/requireValidFunction.ts
@@ -33,7 +33,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
   if (data?.automateFunction?.id) return
 
   const isNotFound = (errors || []).find(
-    (e) => e.extensions['code'] === 'FUNCTION_NOT_FOUND'
+    (e) => e.extensions?.['code'] === 'FUNCTION_NOT_FOUND'
   )
   if (isNotFound) {
     return abortNavigation(
diff --git a/packages/frontend-2/middleware/requireValidModel.ts b/packages/frontend-2/middleware/requireValidModel.ts
index da54b718f..f747d0aa9 100644
--- a/packages/frontend-2/middleware/requireValidModel.ts
+++ b/packages/frontend-2/middleware/requireValidModel.ts
@@ -26,12 +26,12 @@ export default defineNuxtRouteMiddleware(async (to) => {
   // If project succesfully resolved, move on
   if (data?.project?.model?.id) return
 
-  const isForbidden = (errors || []).find((e) => e.extensions['code'] === 'FORBIDDEN')
+  const isForbidden = (errors || []).find((e) => e.extensions?.['code'] === 'FORBIDDEN')
   const isProjectNotFound = (errors || []).find(
-    (e) => e.extensions['code'] === 'STREAM_NOT_FOUND'
+    (e) => e.extensions?.['code'] === 'STREAM_NOT_FOUND'
   )
   const isModelNotFound = (errors || []).find(
-    (e) => e.extensions['code'] === 'BRANCH_NOT_FOUND'
+    (e) => e.extensions?.['code'] === 'BRANCH_NOT_FOUND'
   )
 
   // Check if project exists and model is valid
diff --git a/packages/frontend-2/middleware/requireValidWorkspace.ts b/packages/frontend-2/middleware/requireValidWorkspace.ts
index e43de0e9e..85ac9760e 100644
--- a/packages/frontend-2/middleware/requireValidWorkspace.ts
+++ b/packages/frontend-2/middleware/requireValidWorkspace.ts
@@ -26,9 +26,9 @@ export default defineNuxtRouteMiddleware(async (to) => {
 
   if (data?.workspaceBySlug.id) return
 
-  const isForbidden = (errors || []).find((e) => e.extensions['code'] === 'FORBIDDEN')
+  const isForbidden = (errors || []).find((e) => e.extensions?.['code'] === 'FORBIDDEN')
   const isNotFound = (errors || []).find(
-    (e) => e.extensions['code'] === 'WORKSPACE_NOT_FOUND_ERROR'
+    (e) => e.extensions?.['code'] === 'WORKSPACE_NOT_FOUND_ERROR'
   )
   if (isForbidden) {
     return abortNavigation(
@@ -58,7 +58,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
 
     const firstErrorWithCode = errors.find((e) => e.extensions?.['code'])
     if (firstErrorWithCode) {
-      const errorCode = firstErrorWithCode.extensions['code']
+      const errorCode = firstErrorWithCode.extensions?.['code']
       return abortNavigation(
         createError({
           statusCode: 401,
diff --git a/packages/frontend-2/package.json b/packages/frontend-2/package.json
index 06b3e911d..c5cf57918 100644
--- a/packages/frontend-2/package.json
+++ b/packages/frontend-2/package.json
@@ -23,7 +23,7 @@
     "eslint:inspect": "eslint-config-inspector"
   },
   "dependencies": {
-    "@apollo/client": "^3.9.6",
+    "@apollo/client": "^3.12.4",
     "@artmizu/nuxt-prometheus": "^2.2.1",
     "@datadog/browser-rum": "^5.11.0",
     "@headlessui/vue": "^1.7.13",
@@ -53,7 +53,7 @@
     "@tiptap/suggestion": "2.10.3",
     "@tiptap/vue-3": "2.10.3",
     "@tryghost/content-api": "^1.11.21",
-    "@vue/apollo-composable": "4.0.2",
+    "@vue/apollo-composable": "npm:@speckle/apollo-composable@4.2.1-patch.1",
     "@vue/apollo-ssr": "4.0.0",
     "@vueuse/core": "^10.9.0",
     "apollo-upload-client": "^18.0.1",
@@ -77,7 +77,7 @@
     "tweetnacl-sealedbox-js": "^1.2.0",
     "tweetnacl-util": "^0.15.1",
     "ua-parser-js": "^1.0.38",
-    "vee-validate": "^4.7.0",
+    "vee-validate": "4.7.0",
     "vue-advanced-cropper": "^2.8.8",
     "vue-tippy": "^6.0.0",
     "ws": "^8.17.1"
diff --git a/packages/frontend-2/pages/authn/forgotten-password.vue b/packages/frontend-2/pages/authn/forgotten-password.vue
index 0d0d30f2c..d08460b83 100644
--- a/packages/frontend-2/pages/authn/forgotten-password.vue
+++ b/packages/frontend-2/pages/authn/forgotten-password.vue
@@ -2,5 +2,5 @@
   <AuthPasswordResetPanel />
 </template>
 <script setup lang="ts">
-useHead({ title: 'Forgotten password' })
+useHead({ title: 'Reset your password' })
 </script>
diff --git a/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue b/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue
index c02e658cb..f2cf66b60 100644
--- a/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue
+++ b/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue
@@ -10,9 +10,7 @@
         :name="workspace.name"
         size="xl"
       />
-      <h1 class="text-heading-xl text-center">
-        SSO is required for {{ workspace?.name }}
-      </h1>
+      <h1 class="text-heading-xl text-center">SSO is required for this workspace</h1>
       <div
         class="p-4 rounded-lg border border-outline-2 bg-foundation text-body-xs mb-2"
       >
diff --git a/packages/server/app.ts b/packages/server/app.ts
index cd9fb7d80..eebc72431 100644
--- a/packages/server/app.ts
+++ b/packages/server/app.ts
@@ -70,7 +70,7 @@ import { defaultErrorHandler } from '@/modules/core/rest/defaultErrorHandler'
 import { migrateDbToLatest } from '@/db/migrations'
 import { statusCodePlugin } from '@/modules/core/graph/plugins/statusCode'
 import { BaseError, ForbiddenError } from '@/modules/shared/errors'
-import { loggingPlugin } from '@/modules/core/graph/plugins/logging'
+import { loggingPluginFactory } from '@/modules/core/graph/plugins/logging'
 import { shouldLogAsInfoLevel } from '@/logging/graphqlError'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import { initFactory as healthchecksInitFactory } from '@/healthchecks'
@@ -290,7 +290,7 @@ export function buildApolloSubscriptionServer(
         const ctx = baseParams.context as GraphQLContext
 
         const logger = ctx.log || subscriptionLogger
-        logger.debug(
+        logger.info(
           {
             graphql_operation_name: baseParams.operationName,
             userId: baseParams.context.userId,
@@ -346,7 +346,7 @@ export async function buildApolloServer(options?: {
     schema,
     plugins: [
       statusCodePlugin,
-      loggingPlugin,
+      loggingPluginFactory({ register: prometheusClient.register }),
       ApolloServerPluginLandingPageLocalDefault({
         embed: true,
         includeCookies: true
diff --git a/packages/server/assets/core/typedefs/projects.graphql b/packages/server/assets/core/typedefs/projects.graphql
index 3cf504e2f..aeecf2bb5 100644
--- a/packages/server/assets/core/typedefs/projects.graphql
+++ b/packages/server/assets/core/typedefs/projects.graphql
@@ -199,6 +199,7 @@ input UserProjectsFilter {
   Only include projects where user has the specified roles
   """
   onlyWithRoles: [String!]
+  workspaceId: ID
 }
 
 enum UserProjectsUpdatedMessageType {
diff --git a/packages/server/assets/core/typedefs/user.graphql b/packages/server/assets/core/typedefs/user.graphql
index d8911f09e..e3c839157 100644
--- a/packages/server/assets/core/typedefs/user.graphql
+++ b/packages/server/assets/core/typedefs/user.graphql
@@ -51,6 +51,13 @@ extend type Query {
     @hasServerRole(role: SERVER_GUEST)
     @hasScopes(scopes: ["users:read", "profile:read"])
 
+  """
+  Look up server users with a collection of emails
+  """
+  usersByEmail(input: BulkUsersRetrievalInput!): [LimitedUser]!
+    @hasServerRole(role: SERVER_GUEST)
+    @hasScopes(scopes: ["users:read", "profile:read"])
+
   """
   Validate password strength
   """
@@ -80,6 +87,12 @@ input UsersRetrievalInput {
   projectId: String
 }
 
+input BulkUsersRetrievalInput {
+  emails: [String!]!
+  cursor: String
+  limit: Int
+}
+
 type PasswordStrengthCheckResults {
   """
   Integer from 0-4 (useful for implementing a strength bar):
diff --git a/packages/server/assets/workspacesCore/typedefs/workspaces.graphql b/packages/server/assets/workspacesCore/typedefs/workspaces.graphql
index 37a84b4af..226b28a18 100644
--- a/packages/server/assets/workspacesCore/typedefs/workspaces.graphql
+++ b/packages/server/assets/workspacesCore/typedefs/workspaces.graphql
@@ -503,6 +503,7 @@ extend type Project {
 # case of using userSearch, and we alway expose this
 extend type LimitedUser {
   workspaceDomainPolicyCompliant(workspaceId: String): Boolean
+  workspaceRole(workspaceId: String): String
   # if workspaceId is undefined | null, just return undefined
   # this can be implemented by the workspaceCore resolver too, to avoid frontend component duplication
 }
diff --git a/packages/server/logging/knexMonitoring.ts b/packages/server/logging/knexMonitoring.ts
index f2d087b90..2a46c2d00 100644
--- a/packages/server/logging/knexMonitoring.ts
+++ b/packages/server/logging/knexMonitoring.ts
@@ -212,7 +212,7 @@ const initKnexPrometheusMetricsForRegionEvents = async (params: {
           sqlNumberBindings: data.bindings?.length || -1
         })
         .observe(durationSec)
-    params.logger.debug(
+    params.logger.info(
       {
         region,
         sql: data.sql,
@@ -221,7 +221,7 @@ const initKnexPrometheusMetricsForRegionEvents = async (params: {
         sqlQueryDurationMs: toNDecimalPlaces(durationMs, 0),
         sqlNumberBindings: data.bindings?.length || -1
       },
-      "DB query successfully completed, for method '{sqlMethod}', after {sqlQueryDurationMs}ms"
+      'DB query successfully completed after {sqlQueryDurationMs} ms'
     )
   })
 
diff --git a/packages/server/modules/core/domain/streams/operations.ts b/packages/server/modules/core/domain/streams/operations.ts
index 055066a35..f5d491701 100644
--- a/packages/server/modules/core/domain/streams/operations.ts
+++ b/packages/server/modules/core/domain/streams/operations.ts
@@ -163,7 +163,7 @@ export type BaseUserStreamsQueryParams = {
    * Only allow streams with the specified IDs to be returned
    */
   streamIdWhitelist?: string[]
-  workspaceId?: string
+  workspaceId?: string | null
 
   /**
    * Only with active sso session
diff --git a/packages/server/modules/core/domain/users/operations.ts b/packages/server/modules/core/domain/users/operations.ts
index 8d35419d0..4ab9c8df7 100644
--- a/packages/server/modules/core/domain/users/operations.ts
+++ b/packages/server/modules/core/domain/users/operations.ts
@@ -195,6 +195,18 @@ export type LookupUsers = (filter: {
   cursor: Nullable<string>
 }>
 
+/**
+ * @returns An array of matches in order provided, or null for positions where no match found for email.
+ */
+export type BulkLookupUsers = (filter: {
+  emails: string[]
+  /**
+   * Defaults to 10
+   */
+  limit?: MaybeNullOrUndefined<number>
+  cursor?: MaybeNullOrUndefined<string>
+}) => Promise<(User | null)[]>
+
 type AdminUserListArgs = {
   cursor: string | null
   query: string | null
diff --git a/packages/server/modules/core/graph/generated/graphql.ts b/packages/server/modules/core/graph/generated/graphql.ts
index 83cb44e17..c6b5b2735 100644
--- a/packages/server/modules/core/graph/generated/graphql.ts
+++ b/packages/server/modules/core/graph/generated/graphql.ts
@@ -555,6 +555,12 @@ export type BranchUpdateInput = {
   streamId: Scalars['String']['input'];
 };
 
+export type BulkUsersRetrievalInput = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  emails: Array<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+};
+
 export type CancelCheckoutSessionInput = {
   sessionId: Scalars['ID']['input'];
   workspaceId: Scalars['ID']['input'];
@@ -1074,6 +1080,7 @@ export type LimitedUser = {
   totalOwnedStreamsFavorites: Scalars['Int']['output'];
   verified?: Maybe<Scalars['Boolean']['output']>;
   workspaceDomainPolicyCompliant?: Maybe<Scalars['Boolean']['output']>;
+  workspaceRole?: Maybe<Scalars['String']['output']>;
 };
 
 
@@ -1130,6 +1137,15 @@ export type LimitedUserWorkspaceDomainPolicyCompliantArgs = {
   workspaceId?: InputMaybe<Scalars['String']['input']>;
 };
 
+
+/**
+ * Limited user type, for showing public info about a user
+ * to another user
+ */
+export type LimitedUserWorkspaceRoleArgs = {
+  workspaceId?: InputMaybe<Scalars['String']['input']>;
+};
+
 /** Workspace metadata visible to non-workspace members. */
 export type LimitedWorkspace = {
   __typename?: 'LimitedWorkspace';
@@ -2600,6 +2616,8 @@ export type Query = {
   userSearch: UserSearchResultCollection;
   /** Look up server users */
   users: UserSearchResultCollection;
+  /** Look up server users with a collection of emails */
+  usersByEmail: Array<Maybe<LimitedUser>>;
   /** Validates the slug, to make sure it contains only valid characters and its not taken. */
   validateWorkspaceSlug: Scalars['Boolean']['output'];
   workspace: Workspace;
@@ -2746,6 +2764,11 @@ export type QueryUsersArgs = {
 };
 
 
+export type QueryUsersByEmailArgs = {
+  input: BulkUsersRetrievalInput;
+};
+
+
 export type QueryValidateWorkspaceSlugArgs = {
   slug: Scalars['String']['input'];
 };
@@ -3871,6 +3894,7 @@ export type UserProjectsFilter = {
   onlyWithRoles?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Filter out projects by name */
   search?: InputMaybe<Scalars['String']['input']>;
+  workspaceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
 export type UserProjectsUpdatedMessage = {
@@ -4740,6 +4764,7 @@ export type ResolversTypes = {
   BranchCreateInput: BranchCreateInput;
   BranchDeleteInput: BranchDeleteInput;
   BranchUpdateInput: BranchUpdateInput;
+  BulkUsersRetrievalInput: BulkUsersRetrievalInput;
   CancelCheckoutSessionInput: CancelCheckoutSessionInput;
   CheckoutSession: ResolverTypeWrapper<CheckoutSession>;
   CheckoutSessionInput: CheckoutSessionInput;
@@ -5031,6 +5056,7 @@ export type ResolversParentTypes = {
   BranchCreateInput: BranchCreateInput;
   BranchDeleteInput: BranchDeleteInput;
   BranchUpdateInput: BranchUpdateInput;
+  BulkUsersRetrievalInput: BulkUsersRetrievalInput;
   CancelCheckoutSessionInput: CancelCheckoutSessionInput;
   CheckoutSession: CheckoutSession;
   CheckoutSessionInput: CheckoutSessionInput;
@@ -5759,6 +5785,7 @@ export type LimitedUserResolvers<ContextType = GraphQLContext, ParentType extend
   totalOwnedStreamsFavorites?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   verified?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   workspaceDomainPolicyCompliant?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType, Partial<LimitedUserWorkspaceDomainPolicyCompliantArgs>>;
+  workspaceRole?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType, Partial<LimitedUserWorkspaceRoleArgs>>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
@@ -6168,6 +6195,7 @@ export type QueryResolvers<ContextType = GraphQLContext, ParentType extends Reso
   userPwdStrength?: Resolver<ResolversTypes['PasswordStrengthCheckResults'], ParentType, ContextType, RequireFields<QueryUserPwdStrengthArgs, 'pwd'>>;
   userSearch?: Resolver<ResolversTypes['UserSearchResultCollection'], ParentType, ContextType, RequireFields<QueryUserSearchArgs, 'archived' | 'emailOnly' | 'limit' | 'query'>>;
   users?: Resolver<ResolversTypes['UserSearchResultCollection'], ParentType, ContextType, RequireFields<QueryUsersArgs, 'input'>>;
+  usersByEmail?: Resolver<Array<Maybe<ResolversTypes['LimitedUser']>>, ParentType, ContextType, RequireFields<QueryUsersByEmailArgs, 'input'>>;
   validateWorkspaceSlug?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<QueryValidateWorkspaceSlugArgs, 'slug'>>;
   workspace?: Resolver<ResolversTypes['Workspace'], ParentType, ContextType, RequireFields<QueryWorkspaceArgs, 'id'>>;
   workspaceBySlug?: Resolver<ResolversTypes['Workspace'], ParentType, ContextType, RequireFields<QueryWorkspaceBySlugArgs, 'slug'>>;
diff --git a/packages/server/modules/core/graph/plugins/logging.ts b/packages/server/modules/core/graph/plugins/logging.ts
index 6dd1d71eb..a5febf63c 100644
--- a/packages/server/modules/core/graph/plugins/logging.ts
+++ b/packages/server/modules/core/graph/plugins/logging.ts
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import prometheusClient from 'prom-client'
+import { type Registry, Counter } from 'prom-client'
 import { graphqlLogger } from '@/logging/logging'
 import { redactSensitiveVariables } from '@/logging/loggingHelper'
 import { FieldNode, SelectionNode } from 'graphql'
@@ -25,13 +25,20 @@ declare module '@apollo/server' {
 
 const isFieldNode = (node: SelectionNode): node is FieldNode => node.kind === 'Field'
 
-const metricCallCount = new prometheusClient.Counter({
-  name: 'speckle_server_apollo_calls',
-  help: 'Number of calls',
-  labelNames: ['actionName']
-})
+let metricCallCount: Counter<string>
 
-export const loggingPlugin: ApolloServerPlugin<GraphQLContext> = {
+export const loggingPluginFactory: (deps: {
+  register: Registry
+}) => ApolloServerPlugin<GraphQLContext> = (deps) => ({
+  serverWillStart: async () => {
+    deps.register.removeSingleMetric('speckle_server_apollo_calls')
+    metricCallCount = new Counter({
+      name: 'speckle_server_apollo_calls',
+      help: 'Number of calls',
+      registers: [deps.register],
+      labelNames: ['actionName']
+    })
+  },
   requestDidStart: async () => {
     const apolloRequestStart = Date.now()
     return {
@@ -139,4 +146,4 @@ export const loggingPlugin: ApolloServerPlugin<GraphQLContext> = {
       }
     }
   }
-}
+})
diff --git a/packages/server/modules/core/graph/resolvers/projects.ts b/packages/server/modules/core/graph/resolvers/projects.ts
index 91aed50de..70dcdcd31 100644
--- a/packages/server/modules/core/graph/resolvers/projects.ts
+++ b/packages/server/modules/core/graph/resolvers/projects.ts
@@ -329,7 +329,8 @@ export = {
           forOtherUser: false,
           searchQuery: args.filter?.search || undefined,
           withRoles: (args.filter?.onlyWithRoles || []) as StreamRoles[],
-          streamIdWhitelist: toProjectIdWhitelist(ctx.resourceAccessRules)
+          streamIdWhitelist: toProjectIdWhitelist(ctx.resourceAccessRules),
+          workspaceId: args.filter?.workspaceId
         }),
         getUserStreamsCount({
           userId: ctx.userId!,
@@ -337,7 +338,8 @@ export = {
           searchQuery: args.filter?.search || undefined,
           withRoles: (args.filter?.onlyWithRoles || []) as StreamRoles[],
           streamIdWhitelist: toProjectIdWhitelist(ctx.resourceAccessRules),
-          onlyWithActiveSsoSession: true
+          onlyWithActiveSsoSession: true,
+          workspaceId: args.filter?.workspaceId
         }),
         getUserStreams({
           userId: ctx.userId!,
@@ -347,7 +349,8 @@ export = {
           forOtherUser: false,
           withRoles: (args.filter?.onlyWithRoles || []) as StreamRoles[],
           streamIdWhitelist: toProjectIdWhitelist(ctx.resourceAccessRules),
-          onlyWithActiveSsoSession: true
+          onlyWithActiveSsoSession: true,
+          workspaceId: args.filter?.workspaceId
         })
       ])
 
diff --git a/packages/server/modules/core/graph/resolvers/users.ts b/packages/server/modules/core/graph/resolvers/users.ts
index 8fbf3e518..b0ed9b04b 100644
--- a/packages/server/modules/core/graph/resolvers/users.ts
+++ b/packages/server/modules/core/graph/resolvers/users.ts
@@ -15,7 +15,8 @@ import {
   markOnboardingCompleteFactory,
   legacyGetPaginatedUsersCountFactory,
   legacyGetPaginatedUsersFactory,
-  lookupUsersFactory
+  lookupUsersFactory,
+  bulkLookupUsersFactory
 } from '@/modules/core/repositories/users'
 import { UsersMeta } from '@/modules/core/dbSchema'
 import { throwForNotHavingServerRole } from '@/modules/shared/authz'
@@ -69,6 +70,7 @@ const changeUserRole = changeUserRoleFactory({
   updateUserServerRole: updateUserServerRoleFactory({ db })
 })
 const searchUsers = searchUsersFactory({ db })
+const bulkLookupUsers = bulkLookupUsersFactory({ db })
 const lookupUsers = lookupUsersFactory({ db })
 const markOnboardingComplete = markOnboardingCompleteFactory({ db })
 const getAdminUsersListCollection = getAdminUsersListCollectionFactory({
@@ -150,7 +152,17 @@ export = {
       const { cursor, users } = await lookupUsers(args.input)
       return { cursor, items: users }
     },
+    async usersByEmail(_parent, args) {
+      if (args.input.emails.length < 1)
+        throw new BadRequestError('Must provide at least one email to search for.')
 
+      if ((args.input.limit || 0) > 20)
+        throw new BadRequestError(
+          'Cannot return more than 20 items, please use a shorter list.'
+        )
+
+      return await bulkLookupUsers(args.input)
+    },
     async userPwdStrength(_parent, args) {
       const res = zxcvbn(args.pwd)
       return { score: res.score, feedback: res.feedback }
diff --git a/packages/server/modules/core/repositories/streams.ts b/packages/server/modules/core/repositories/streams.ts
index a2cbf98e6..02c364b64 100644
--- a/packages/server/modules/core/repositories/streams.ts
+++ b/packages/server/modules/core/repositories/streams.ts
@@ -713,7 +713,7 @@ const getUserStreamsQueryBaseFactory =
         })
     }
 
-    if (workspaceId) {
+    if (!isUndefined(workspaceId)) {
       query.andWhere(Streams.col.workspaceId, workspaceId)
     }
 
diff --git a/packages/server/modules/core/repositories/users.ts b/packages/server/modules/core/repositories/users.ts
index abf8c4af1..daa9899be 100644
--- a/packages/server/modules/core/repositories/users.ts
+++ b/packages/server/modules/core/repositories/users.ts
@@ -10,6 +10,7 @@ import { updateUserEmailFactory } from '@/modules/core/repositories/userEmails'
 import { markUserEmailAsVerifiedFactory } from '@/modules/core/services/users/emailVerification'
 import { UserWithOptionalRole } from '@/modules/core/domain/users/types'
 import {
+  BulkLookupUsers,
   CountAdminUsers,
   CountUsers,
   DeleteUserRecord,
@@ -449,6 +450,36 @@ export const getUserRoleFactory =
     return role as Nullable<ServerRoles>
   }
 
+type LookupUsersBaseQueryFilter = {
+  cursor?: string | null
+  limit?: number | null
+}
+
+export const lookupUsersBaseQuery = (
+  db: Knex,
+  filter: LookupUsersBaseQueryFilter = {}
+) => {
+  const query = tables
+    .users(db)
+    .join(ServerAcl.name, Users.col.id, ServerAcl.col.userId)
+    .leftJoin(UserEmails.name, UserEmails.col.userId, Users.col.id)
+    .columns([
+      ...Object.values(
+        omit(Users.col, [Users.col.email, Users.col.verified, Users.col.passwordDigest])
+      ),
+      knex.raw(`(array_agg(??))[1] as "verified"`, [UserEmails.col.verified]),
+      knex.raw(`(array_agg(??))[1] as "email"`, [UserEmails.col.email])
+    ])
+    .groupBy(Users.col.id)
+
+  if (filter.cursor) query.andWhere(Users.col.createdAt, '<', filter.cursor)
+
+  const finalLimit = clamp(filter.limit || 10, 1, 100)
+  query.orderBy(Users.col.createdAt, 'desc').limit(finalLimit)
+
+  return query
+}
+
 /**
  * Used for (Limited)User search. No need to convert users to Limited here, because non-limited fields
  * cannot be leaked out from the GQL API.
@@ -465,41 +496,23 @@ export const lookupUsersFactory =
       projectId
     } = filter
 
-    const query = tables
-      .users(deps.db)
-      .join(ServerAcl.name, Users.col.id, ServerAcl.col.userId)
-      .leftJoin(UserEmails.name, UserEmails.col.userId, Users.col.id)
-      .columns([
-        ...Object.values(
-          omit(Users.col, [
-            Users.col.email,
-            Users.col.verified,
-            Users.col.passwordDigest
-          ])
-        ),
-        knex.raw(`(array_agg(??))[1] as "verified"`, [UserEmails.col.verified]),
-        knex.raw(`(array_agg(??))[1] as "email"`, [UserEmails.col.email])
-      ])
-      .groupBy(Users.col.id)
-      .where((queryBuilder) => {
-        queryBuilder.where({ [UserEmails.col.email]: searchQuery }) //match full email or partial name
-        if (!emailOnly)
-          queryBuilder.orWhere(Users.col.name, 'ILIKE', `%${searchQuery}%`)
-        if (!archived)
-          queryBuilder.andWhere(ServerAcl.col.role, '!=', Roles.Server.ArchivedUser)
-      })
+    const query = lookupUsersBaseQuery(deps.db, { limit, cursor })
 
+    // match full email or partial name
+    query.where((queryBuilder) => {
+      queryBuilder.where({ [UserEmails.col.email]: searchQuery.toLowerCase() })
+      if (!emailOnly) queryBuilder.orWhere(Users.col.name, 'ILIKE', `%${searchQuery}%`)
+      if (!archived)
+        queryBuilder.andWhere(ServerAcl.col.role, '!=', Roles.Server.ArchivedUser)
+    })
+
+    // limit to given project
     if (projectId) {
       query
         .innerJoin(StreamAcl.name, StreamAcl.col.userId, Users.col.id)
         .andWhere(StreamAcl.col.resourceId, projectId)
     }
 
-    if (cursor) query.andWhere(Users.col.createdAt, '<', cursor)
-
-    const finalLimit = clamp(limit || 10, 1, 100)
-    query.orderBy(Users.col.createdAt, 'desc').limit(finalLimit)
-
     const rows = (await query) as UserRecord[]
     const users = rows.map((u) => sanitizeUserRecord(u)) // pw shouldnt be there, but just making sure
 
@@ -509,6 +522,32 @@ export const lookupUsersFactory =
     }
   }
 
+/**
+ * Used for (Limited)User search when multiple potential emails are known
+ * @param deps
+ * @returns
+ */
+export const bulkLookupUsersFactory =
+  (deps: { db: Knex }): BulkLookupUsers =>
+  async (filter) => {
+    const { emails, limit, cursor } = filter
+
+    const query = lookupUsersBaseQuery(deps.db, { limit, cursor })
+
+    // limit to exact matches on provided emails
+    query.whereIn(
+      UserEmails.col.email,
+      emails.map((email) => email.toLowerCase())
+    )
+
+    const matches = (await query) as UserRecord[]
+    const result = emails.map((email) =>
+      matches.find((user) => user.email === email.toLowerCase())
+    )
+
+    return result.map((user) => (user ? sanitizeUserRecord(user) : null))
+  }
+
 /**
  * User search available for normal server users. It's more limited because of the lower access level.
  * @deprecated Use lookupUsers instead
diff --git a/packages/server/modules/core/tests/helpers/graphql.ts b/packages/server/modules/core/tests/helpers/graphql.ts
index 5043845c0..6e7515990 100644
--- a/packages/server/modules/core/tests/helpers/graphql.ts
+++ b/packages/server/modules/core/tests/helpers/graphql.ts
@@ -118,7 +118,6 @@ export const onBranchDeletedSubscription = gql`
     branchDeleted(streamId: $streamId)
   }
 `
-
 export const usersRetrievalQuery = gql`
   query UsersRetrieval($input: UsersRetrievalInput!) {
     users(input: $input) {
@@ -130,3 +129,17 @@ export const usersRetrievalQuery = gql`
     }
   }
 `
+
+export const activeUserProjectsQuery = gql`
+  query ActiveUserProjects($filter: UserProjectsFilter!) {
+    activeUser {
+      projects(filter: $filter) {
+        cursor
+        items {
+          id
+          name
+        }
+      }
+    }
+  }
+`
diff --git a/packages/server/modules/core/tests/integration/findUsers.spec.ts b/packages/server/modules/core/tests/integration/findUsers.spec.ts
index 15800b1a2..541aa04eb 100644
--- a/packages/server/modules/core/tests/integration/findUsers.spec.ts
+++ b/packages/server/modules/core/tests/integration/findUsers.spec.ts
@@ -12,11 +12,13 @@ import {
 import { db } from '@/db/knex'
 import { expect } from 'chai'
 import {
+  bulkLookupUsersFactory,
   countAdminUsersFactory,
   getUserByEmailFactory,
   getUserFactory,
   getUsersFactory,
   listUsersFactory,
+  lookupUsersFactory,
   storeUserAclFactory,
   storeUserFactory
 } from '@/modules/core/repositories/users'
@@ -32,6 +34,8 @@ import {
   updateAllInviteTargetsFactory
 } from '@/modules/serverinvites/repositories/serverInvites'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import { BasicTestStream, createTestStream } from '@/test/speckle-helpers/streamHelper'
+import { BasicTestUser, createTestUser } from '@/test/authHelper'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
 const getServerInfo = getServerInfoFactory({ db })
@@ -65,6 +69,8 @@ const createUser = createUserFactory({
 })
 const getUserByEmail = getUserByEmailFactory({ db })
 const listUsers = listUsersFactory({ db })
+const lookupUsers = lookupUsersFactory({ db })
+const bulkLookupUsers = bulkLookupUsersFactory({ db })
 
 describe('Find users @core', () => {
   describe('getUsers', () => {
@@ -157,4 +163,145 @@ describe('Find users @core', () => {
       expect(user!.email).to.equal(email.toLowerCase())
     })
   })
+
+  describe('lookupUsers', () => {
+    it('should find matches by name', async () => {
+      const email = createRandomEmail()
+      const userId = await createUser({
+        email,
+        name: 'John Spackle',
+        password: createRandomPassword()
+      })
+      const { users } = await lookupUsers({ query: 'Spack' })
+      expect(users.some((user) => user.id === userId)).to.equal(true)
+    })
+    it('should not find matches by name if filtered to emails only', async () => {
+      const email = createRandomEmail()
+      const userId = await createUser({
+        email,
+        name: 'John Spackle',
+        password: createRandomPassword()
+      })
+      const { users } = await lookupUsers({ query: 'Spack', emailOnly: true })
+      expect(users.some((user) => user.id === userId)).to.equal(false)
+    })
+    it('should find matches by email', async () => {
+      const email = createRandomEmail()
+      const userId = await createUser({
+        email,
+        name: 'John Spackle',
+        password: createRandomPassword()
+      })
+      const { users } = await lookupUsers({ query: email })
+      expect(users.some((user) => user.id === userId)).to.equal(true)
+    })
+    it('should find matches by email, case insensitive', async () => {
+      const email = 'fooBAR@example.org'
+      const userId = await createUser({
+        email,
+        name: 'John Spackle',
+        password: createRandomPassword()
+      })
+      const { users } = await lookupUsers({ query: 'FoObAr@example.org' })
+      expect(users.some((user) => user.id === userId)).to.equal(true)
+    })
+    it('should find matches limited to the given project', async () => {
+      const userA: BasicTestUser = {
+        id: '',
+        email: createRandomEmail(),
+        name: 'Beatrice'
+      }
+      const userB: BasicTestUser = {
+        id: '',
+        email: createRandomEmail(),
+        name: 'Beatrice'
+      }
+      await createTestUser(userA)
+      await createTestUser(userB)
+      const project: BasicTestStream = {
+        id: '',
+        ownerId: '',
+        name: 'Test Project',
+        isPublic: false
+      }
+      await createTestStream(project, userA)
+
+      const { users } = await lookupUsers({ query: 'beatrice', projectId: project.id })
+      expect(users.some((user) => user.id === userA.id)).to.equal(true)
+      expect(users.some((user) => user.id === userB.id)).to.equal(false)
+    })
+  })
+
+  describe('bulkLookupUsers', () => {
+    it('should find matches for all emails provided', async () => {
+      const userA: BasicTestUser = {
+        id: '',
+        email: createRandomEmail(),
+        name: 'Harald'
+      }
+      const userB: BasicTestUser = {
+        id: '',
+        email: createRandomEmail(),
+        name: 'Beatrice'
+      }
+      await createTestUser(userA)
+      await createTestUser(userB)
+
+      const users = await bulkLookupUsers({ emails: [userA.email, userB.email] })
+
+      expect(users.length).to.equal(2)
+      expect(users.some((user) => user?.id === userA.id)).to.equal(true)
+      expect(users.some((user) => user?.id === userB.id)).to.equal(true)
+    })
+    it('should return matches in the same order they were provided', async () => {
+      const userA: BasicTestUser = {
+        id: '',
+        email: createRandomEmail(),
+        name: 'Barald'
+      }
+      const userB: BasicTestUser = {
+        id: '',
+        email: createRandomEmail(),
+        name: 'Heatrice'
+      }
+      await createTestUser(userA)
+      await createTestUser(userB)
+
+      const users = await bulkLookupUsers({ emails: [userB.email, userA.email] })
+
+      expect(users[0]?.id).to.equal(userB.id)
+      expect(users[1]?.id).to.equal(userA.id)
+    })
+    it('should find matches for all emails provided, case insensitive', async () => {
+      const testUser: BasicTestUser = {
+        id: '',
+        email: 'barBAZ@example.org',
+        name: 'Bonathon'
+      }
+      await createTestUser(testUser)
+
+      const users = await bulkLookupUsers({ emails: ['BARbaz@example.org'] })
+
+      expect(users.length).to.equal(1)
+      expect(users.some((user) => user?.id === testUser.id)).to.equal(true)
+    })
+    it('should return null for positions where email matched no user', async () => {
+      const testEmail = createRandomEmail()
+      const testUser: BasicTestUser = {
+        id: '',
+        email: testEmail,
+        name: 'MICHAEL'
+      }
+      await createTestUser(testUser)
+
+      const users = await bulkLookupUsers({
+        emails: [createRandomEmail(), testEmail, createRandomEmail()]
+      })
+
+      expect(users.length).to.equal(3)
+      expect(users[0]).to.equal(null)
+      expect(users[1]?.id).to.equal(testUser.id)
+      expect(users[2]).to.equal(null)
+    })
+  })
 })
diff --git a/packages/server/modules/core/tests/integration/projects.graph.spec.ts b/packages/server/modules/core/tests/integration/projects.graph.spec.ts
new file mode 100644
index 000000000..b21bd527e
--- /dev/null
+++ b/packages/server/modules/core/tests/integration/projects.graph.spec.ts
@@ -0,0 +1,181 @@
+import { createTestWorkspace } from '@/modules/workspaces/tests/helpers/creation'
+import {
+  BasicTestUser,
+  createAuthTokenForUser,
+  createTestUsers
+} from '@/test/authHelper'
+import {
+  ActiveUserProjectsDocument,
+  CreateProjectDocument,
+  CreateWorkspaceProjectDocument,
+  GetWorkspaceDocument
+} from '@/test/graphql/generated/graphql'
+import {
+  createTestContext,
+  testApolloServer,
+  TestApolloServer
+} from '@/test/graphqlHelper'
+import { beforeEachContext } from '@/test/hooks'
+import { Roles, AllScopes } from '@/modules/core/helpers/mainConstants'
+import { expect } from 'chai'
+import cryptoRandomString from 'crypto-random-string'
+import { beforeEach } from 'mocha'
+import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
+
+const { FF_WORKSPACES_MODULE_ENABLED } = getFeatureFlags()
+
+describe('Projects GraphQL @core', () => {
+  let apollo: TestApolloServer
+
+  const testAdminUser: BasicTestUser = {
+    id: '',
+    name: 'John Speckle',
+    email: 'john-speckle@example.org',
+    role: Roles.Server.Admin,
+    verified: true
+  }
+
+  beforeEach(async () => {
+    await beforeEachContext()
+    await createTestUsers([testAdminUser])
+    const token = await createAuthTokenForUser(testAdminUser.id, AllScopes)
+    apollo = await testApolloServer({
+      context: await createTestContext({
+        auth: true,
+        userId: testAdminUser.id,
+        token,
+        role: testAdminUser.role,
+        scopes: AllScopes
+      })
+    })
+  })
+
+  describe('query user.projects', () => {
+    ;(FF_WORKSPACES_MODULE_ENABLED ? it : it.skip)(
+      'should return projects not in a workspace',
+      async () => {
+        const workspace = {
+          id: '',
+          name: 'test ws',
+          slug: cryptoRandomString({ length: 10 }),
+          ownerId: ''
+        }
+        await createTestWorkspace(workspace, testAdminUser)
+
+        const getWorkspaceRes = await apollo.execute(GetWorkspaceDocument, {
+          workspaceId: workspace.id
+        })
+
+        expect(getWorkspaceRes).to.not.haveGraphQLErrors()
+        const workspaceId = getWorkspaceRes.data!.workspace.id
+
+        const createProjectInWorkspaceRes = await apollo.execute(
+          CreateWorkspaceProjectDocument,
+          { input: { name: 'project', workspaceId } }
+        )
+        expect(createProjectInWorkspaceRes).to.not.haveGraphQLErrors()
+
+        const createProjectNonInWorkspaceRes = await apollo.execute(
+          CreateProjectDocument,
+          { input: { name: 'project' } }
+        )
+        expect(createProjectNonInWorkspaceRes).to.not.haveGraphQLErrors()
+        const projectNonInWorkspace =
+          createProjectNonInWorkspaceRes.data!.projectMutations.create
+
+        const userProjectsRes = await apollo.execute(ActiveUserProjectsDocument, {
+          filter: { workspaceId: null }
+        })
+        expect(userProjectsRes).to.not.haveGraphQLErrors()
+
+        const projects = userProjectsRes.data!.activeUser!.projects.items
+
+        expect(projects).to.have.length(1)
+        expect(projects[0].id).to.eq(projectNonInWorkspace.id)
+      }
+    )
+    ;(FF_WORKSPACES_MODULE_ENABLED ? it : it.skip)(
+      'should return projects in workspace',
+      async () => {
+        const workspace = {
+          id: '',
+          name: 'test ws',
+          slug: cryptoRandomString({ length: 10 }),
+          ownerId: ''
+        }
+        await createTestWorkspace(workspace, testAdminUser)
+
+        const getWorkspaceRes = await apollo.execute(GetWorkspaceDocument, {
+          workspaceId: workspace.id
+        })
+
+        expect(getWorkspaceRes).to.not.haveGraphQLErrors()
+        const workspaceId = getWorkspaceRes.data!.workspace.id
+
+        const createProjectInWorkspaceRes = await apollo.execute(
+          CreateWorkspaceProjectDocument,
+          { input: { name: 'project', workspaceId } }
+        )
+        expect(createProjectInWorkspaceRes).to.not.haveGraphQLErrors()
+        const projectInWorkspace =
+          createProjectInWorkspaceRes.data!.workspaceMutations.projects.create
+
+        const createProjectNonInWorkspaceRes = await apollo.execute(
+          CreateProjectDocument,
+          { input: { name: 'project' } }
+        )
+        expect(createProjectNonInWorkspaceRes).to.not.haveGraphQLErrors()
+
+        const userProjectsRes = await apollo.execute(ActiveUserProjectsDocument, {
+          filter: { workspaceId }
+        })
+        expect(userProjectsRes).to.not.haveGraphQLErrors()
+
+        const projects = userProjectsRes.data!.activeUser!.projects.items
+
+        expect(projects).to.have.length(1)
+        expect(projects[0].id).to.eq(projectInWorkspace.id)
+      }
+    )
+    ;(FF_WORKSPACES_MODULE_ENABLED ? it : it.skip)(
+      'should return all user projects',
+      async () => {
+        const workspace = {
+          id: '',
+          name: 'test ws',
+          slug: cryptoRandomString({ length: 10 }),
+          ownerId: ''
+        }
+        await createTestWorkspace(workspace, testAdminUser)
+
+        const getWorkspaceRes = await apollo.execute(GetWorkspaceDocument, {
+          workspaceId: workspace.id
+        })
+
+        expect(getWorkspaceRes).to.not.haveGraphQLErrors()
+        const workspaceId = getWorkspaceRes.data!.workspace.id
+
+        const createProjectInWorkspaceRes = await apollo.execute(
+          CreateWorkspaceProjectDocument,
+          { input: { name: 'project', workspaceId } }
+        )
+        expect(createProjectInWorkspaceRes).to.not.haveGraphQLErrors()
+
+        const createProjectNonInWorkspaceRes = await apollo.execute(
+          CreateProjectDocument,
+          { input: { name: 'project' } }
+        )
+        expect(createProjectNonInWorkspaceRes).to.not.haveGraphQLErrors()
+
+        const userProjectsRes = await apollo.execute(ActiveUserProjectsDocument, {
+          filter: {}
+        })
+        expect(userProjectsRes).to.not.haveGraphQLErrors()
+
+        const projects = userProjectsRes.data!.activeUser!.projects.items
+
+        expect(projects).to.have.length(2)
+      }
+    )
+  })
+})
diff --git a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
index aacc53c5d..b2c96a2a6 100644
--- a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
+++ b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
@@ -536,6 +536,12 @@ export type BranchUpdateInput = {
   streamId: Scalars['String']['input'];
 };
 
+export type BulkUsersRetrievalInput = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  emails: Array<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+};
+
 export type CancelCheckoutSessionInput = {
   sessionId: Scalars['ID']['input'];
   workspaceId: Scalars['ID']['input'];
@@ -1055,6 +1061,7 @@ export type LimitedUser = {
   totalOwnedStreamsFavorites: Scalars['Int']['output'];
   verified?: Maybe<Scalars['Boolean']['output']>;
   workspaceDomainPolicyCompliant?: Maybe<Scalars['Boolean']['output']>;
+  workspaceRole?: Maybe<Scalars['String']['output']>;
 };
 
 
@@ -1111,6 +1118,15 @@ export type LimitedUserWorkspaceDomainPolicyCompliantArgs = {
   workspaceId?: InputMaybe<Scalars['String']['input']>;
 };
 
+
+/**
+ * Limited user type, for showing public info about a user
+ * to another user
+ */
+export type LimitedUserWorkspaceRoleArgs = {
+  workspaceId?: InputMaybe<Scalars['String']['input']>;
+};
+
 /** Workspace metadata visible to non-workspace members. */
 export type LimitedWorkspace = {
   __typename?: 'LimitedWorkspace';
@@ -2581,6 +2597,8 @@ export type Query = {
   userSearch: UserSearchResultCollection;
   /** Look up server users */
   users: UserSearchResultCollection;
+  /** Look up server users with a collection of emails */
+  usersByEmail: Array<Maybe<LimitedUser>>;
   /** Validates the slug, to make sure it contains only valid characters and its not taken. */
   validateWorkspaceSlug: Scalars['Boolean']['output'];
   workspace: Workspace;
@@ -2727,6 +2745,11 @@ export type QueryUsersArgs = {
 };
 
 
+export type QueryUsersByEmailArgs = {
+  input: BulkUsersRetrievalInput;
+};
+
+
 export type QueryValidateWorkspaceSlugArgs = {
   slug: Scalars['String']['input'];
 };
@@ -3852,6 +3875,7 @@ export type UserProjectsFilter = {
   onlyWithRoles?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Filter out projects by name */
   search?: InputMaybe<Scalars['String']['input']>;
+  workspaceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
 export type UserProjectsUpdatedMessage = {
diff --git a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
index a0ab38e23..6e461da93 100644
--- a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
+++ b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
@@ -1357,6 +1357,24 @@ export = FF_WORKSPACES_MODULE_ENABLED
             findEmailsByUserId: findEmailsByUserIdFactory({ db }),
             getWorkspaceWithDomains: getWorkspaceWithDomainsFactory({ db })
           })({ workspaceId, userId })
+        },
+        workspaceRole: async (parent, args, context) => {
+          const workspaceId = args.workspaceId
+          if (!workspaceId) return null
+
+          await authorizeResolver(
+            context.userId,
+            workspaceId,
+            Roles.Workspace.Member,
+            context.resourceAccessRules
+          )
+
+          const userId = parent.id
+
+          return await getWorkspaceRoleForUserFactory({ db })({
+            userId,
+            workspaceId
+          })
         }
       },
       ServerInfo: {
diff --git a/packages/server/modules/workspacesCore/domain/types.ts b/packages/server/modules/workspacesCore/domain/types.ts
index d05118278..65d4ff5f9 100644
--- a/packages/server/modules/workspacesCore/domain/types.ts
+++ b/packages/server/modules/workspacesCore/domain/types.ts
@@ -66,3 +66,17 @@ export type WorkspaceRegionAssignment = {
   regionKey: string
   createdAt: Date
 }
+
+export type WorkspaceJoinRequestStatus =
+  | 'pending'
+  | 'accepted'
+  | 'rejected'
+  | 'dismissed'
+
+export type WorkspaceJoinRequest = {
+  workspaceId: string
+  userId: string
+  status: WorkspaceJoinRequestStatus
+  createdAt: Date
+  updatedAt: Date
+}
diff --git a/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts b/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts
index 1c89faa5f..6c1ae8550 100644
--- a/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts
+++ b/packages/server/modules/workspacesCore/graph/resolvers/workspacesCore.ts
@@ -115,7 +115,8 @@ export = !FF_WORKSPACES_MODULE_ENABLED
         }
       },
       LimitedUser: {
-        workspaceDomainPolicyCompliant: async () => null
+        workspaceDomainPolicyCompliant: async () => null,
+        workspaceRole: async () => null
       },
       ServerInfo: {
         workspaces: () => ({})
diff --git a/packages/server/modules/workspacesCore/helpers/db.ts b/packages/server/modules/workspacesCore/helpers/db.ts
index dc0321614..1836d12bc 100644
--- a/packages/server/modules/workspacesCore/helpers/db.ts
+++ b/packages/server/modules/workspacesCore/helpers/db.ts
@@ -30,3 +30,11 @@ export const WorkspaceDomains = buildTableHelper('workspace_domains', [
   'createdByUserId',
   'verified'
 ])
+
+export const WorkspaceJoinRequests = buildTableHelper('workspace_join_requests', [
+  'workspaceId',
+  'userId',
+  'status',
+  'createdAt',
+  'updatedAt'
+])
diff --git a/packages/server/modules/workspacesCore/migrations/20241220093308_create_workspace_join_requests_table.ts b/packages/server/modules/workspacesCore/migrations/20241220093308_create_workspace_join_requests_table.ts
new file mode 100644
index 000000000..ce94b464a
--- /dev/null
+++ b/packages/server/modules/workspacesCore/migrations/20241220093308_create_workspace_join_requests_table.ts
@@ -0,0 +1,37 @@
+import { Knex } from 'knex'
+
+const USERS_TABLE = 'users'
+const WORKSPACES_TABLE = 'workspaces'
+const WORKSPACE_JOIN_REQUESTS_TABLE = 'workspace_join_requests'
+
+export async function up(knex: Knex): Promise<void> {
+  await knex.schema.createTable(WORKSPACE_JOIN_REQUESTS_TABLE, (table) => {
+    table
+      .text('workspaceId')
+      .references('id')
+      .inTable(WORKSPACES_TABLE)
+      .onDelete('cascade')
+      .notNullable()
+    table
+      .text('userId')
+      .references('id')
+      .inTable(USERS_TABLE)
+      .onDelete('cascade')
+      .notNullable()
+    table.text('status').notNullable()
+    table
+      .timestamp('createdAt', { precision: 3, useTz: true })
+      .defaultTo(knex.fn.now())
+      .notNullable()
+    table
+      .timestamp('updatedAt', { precision: 3, useTz: true })
+      .defaultTo(knex.fn.now())
+      .notNullable()
+
+    table.primary(['workspaceId', 'userId'])
+  })
+}
+
+export async function down(knex: Knex): Promise<void> {
+  await knex.schema.dropTable(WORKSPACE_JOIN_REQUESTS_TABLE)
+}
diff --git a/packages/server/test/graphql/generated/graphql.ts b/packages/server/test/graphql/generated/graphql.ts
index cf1fe3eda..cabbd586e 100644
--- a/packages/server/test/graphql/generated/graphql.ts
+++ b/packages/server/test/graphql/generated/graphql.ts
@@ -537,6 +537,12 @@ export type BranchUpdateInput = {
   streamId: Scalars['String']['input'];
 };
 
+export type BulkUsersRetrievalInput = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  emails: Array<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+};
+
 export type CancelCheckoutSessionInput = {
   sessionId: Scalars['ID']['input'];
   workspaceId: Scalars['ID']['input'];
@@ -1056,6 +1062,7 @@ export type LimitedUser = {
   totalOwnedStreamsFavorites: Scalars['Int']['output'];
   verified?: Maybe<Scalars['Boolean']['output']>;
   workspaceDomainPolicyCompliant?: Maybe<Scalars['Boolean']['output']>;
+  workspaceRole?: Maybe<Scalars['String']['output']>;
 };
 
 
@@ -1112,6 +1119,15 @@ export type LimitedUserWorkspaceDomainPolicyCompliantArgs = {
   workspaceId?: InputMaybe<Scalars['String']['input']>;
 };
 
+
+/**
+ * Limited user type, for showing public info about a user
+ * to another user
+ */
+export type LimitedUserWorkspaceRoleArgs = {
+  workspaceId?: InputMaybe<Scalars['String']['input']>;
+};
+
 /** Workspace metadata visible to non-workspace members. */
 export type LimitedWorkspace = {
   __typename?: 'LimitedWorkspace';
@@ -2582,6 +2598,8 @@ export type Query = {
   userSearch: UserSearchResultCollection;
   /** Look up server users */
   users: UserSearchResultCollection;
+  /** Look up server users with a collection of emails */
+  usersByEmail: Array<Maybe<LimitedUser>>;
   /** Validates the slug, to make sure it contains only valid characters and its not taken. */
   validateWorkspaceSlug: Scalars['Boolean']['output'];
   workspace: Workspace;
@@ -2728,6 +2746,11 @@ export type QueryUsersArgs = {
 };
 
 
+export type QueryUsersByEmailArgs = {
+  input: BulkUsersRetrievalInput;
+};
+
+
 export type QueryValidateWorkspaceSlugArgs = {
   slug: Scalars['String']['input'];
 };
@@ -3853,6 +3876,7 @@ export type UserProjectsFilter = {
   onlyWithRoles?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Filter out projects by name */
   search?: InputMaybe<Scalars['String']['input']>;
+  workspaceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
 export type UserProjectsUpdatedMessage = {
@@ -4703,6 +4727,13 @@ export type UsersRetrievalQueryVariables = Exact<{
 
 export type UsersRetrievalQuery = { __typename?: 'Query', users: { __typename?: 'UserSearchResultCollection', cursor?: string | null, items: Array<{ __typename?: 'LimitedUser', id: string, name: string }> } };
 
+export type ActiveUserProjectsQueryVariables = Exact<{
+  filter: UserProjectsFilter;
+}>;
+
+
+export type ActiveUserProjectsQuery = { __typename?: 'Query', activeUser?: { __typename?: 'User', projects: { __typename?: 'UserProjectCollection', cursor?: string | null, items: Array<{ __typename?: 'Project', id: string, name: string }> } } | null };
+
 export type BasicWorkspaceFragment = { __typename?: 'Workspace', id: string, name: string, slug: string, updatedAt: string, createdAt: string, role?: string | null, readOnly: boolean };
 
 export type BasicPendingWorkspaceCollaboratorFragment = { __typename?: 'PendingWorkspaceCollaborator', id: string, inviteId: string, workspaceId: string, workspaceName: string, title: string, role: string, token?: string | null, invitedBy: { __typename?: 'LimitedUser', id: string, name: string }, user?: { __typename?: 'LimitedUser', id: string, name: string } | null };
@@ -5524,6 +5555,7 @@ export const OnBranchCreatedDocument = {"kind":"Document","definitions":[{"kind"
 export const OnBranchUpdatedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"OnBranchUpdated"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"branchId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"branchUpdated"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}},{"kind":"Argument","name":{"kind":"Name","value":"branchId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"branchId"}}}]}]}}]} as unknown as DocumentNode<OnBranchUpdatedSubscription, OnBranchUpdatedSubscriptionVariables>;
 export const OnBranchDeletedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"OnBranchDeleted"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"branchDeleted"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}]}]}}]} as unknown as DocumentNode<OnBranchDeletedSubscription, OnBranchDeletedSubscriptionVariables>;
 export const UsersRetrievalDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UsersRetrieval"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UsersRetrievalInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"users"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]} as unknown as DocumentNode<UsersRetrievalQuery, UsersRetrievalQueryVariables>;
+export const ActiveUserProjectsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ActiveUserProjects"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filter"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UserProjectsFilter"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"projects"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]}}]} as unknown as DocumentNode<ActiveUserProjectsQuery, ActiveUserProjectsQueryVariables>;
 export const CreateWorkspaceInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateWorkspaceInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"WorkspaceInviteCreateInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"invites"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"create"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicWorkspace"}},{"kind":"Field","name":{"kind":"Name","value":"invitedTeam"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicWorkspace"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Workspace"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"readOnly"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingWorkspaceCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"token"}}]}}]} as unknown as DocumentNode<CreateWorkspaceInviteMutation, CreateWorkspaceInviteMutationVariables>;
 export const BatchCreateWorkspaceInvitesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"BatchCreateWorkspaceInvites"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"WorkspaceInviteCreateInput"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"invites"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"batchCreate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicWorkspace"}},{"kind":"Field","name":{"kind":"Name","value":"invitedTeam"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicWorkspace"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Workspace"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"readOnly"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingWorkspaceCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"token"}}]}}]} as unknown as DocumentNode<BatchCreateWorkspaceInvitesMutation, BatchCreateWorkspaceInvitesMutationVariables>;
 export const GetWorkspaceWithTeamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetWorkspaceWithTeam"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspace"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicWorkspace"}},{"kind":"Field","name":{"kind":"Name","value":"invitedTeam"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicWorkspace"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Workspace"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"readOnly"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingWorkspaceCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"token"}}]}}]} as unknown as DocumentNode<GetWorkspaceWithTeamQuery, GetWorkspaceWithTeamQueryVariables>;
diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
index dec96d271..ed8b3efdc 100644
--- a/packages/ui-components/package.json
+++ b/packages/ui-components/package.json
@@ -45,6 +45,7 @@
     }
   },
   "peerDependencies": {
+    "vee-validate": "^4.7.0",
     "vue": "^3.3.0"
   },
   "dependencies": {
@@ -57,7 +58,6 @@
     "lodash-es": "^4.0.0",
     "nanoid": "^3.0.0",
     "v3-infinite-loading": "^1.2.2",
-    "vee-validate": "^4.7.0",
     "vue-advanced-cropper": "^2.8.8",
     "vue-tippy": "^6.0.0"
   },
@@ -97,6 +97,7 @@
     "type-fest": "^2.13.1",
     "typescript": "^5.0.4",
     "unplugin-vue-macros": "^2.7.0",
+    "vee-validate": "4.7.0",
     "vite": "^4.5.2",
     "vite-plugin-dts": "^3.6.3",
     "vue": "^3.3.8",
diff --git a/packages/viewer-sandbox/src/main.ts b/packages/viewer-sandbox/src/main.ts
index 1e5cca01b..a936e51d9 100644
--- a/packages/viewer-sandbox/src/main.ts
+++ b/packages/viewer-sandbox/src/main.ts
@@ -21,7 +21,6 @@ import { SectionTool } from '@speckle/viewer'
 import { SectionOutlines } from '@speckle/viewer'
 import { ViewModesKeys } from './Extensions/ViewModesKeys'
 import { BoxSelection } from './Extensions/BoxSelection'
-import { SnowPipeline } from './Pipelines/Snow/SnowPipeline'
 
 const createViewer = async (containerName: string, _stream: string) => {
   const container = document.querySelector<HTMLElement>(containerName)
@@ -83,9 +82,6 @@ const createViewer = async (containerName: string, _stream: string) => {
     Object.assign(sandbox.sceneParams.worldSize, viewer.World.worldSize)
     Object.assign(sandbox.sceneParams.worldOrigin, viewer.World.worldOrigin)
     sandbox.refresh()
-    const snowPipeline = new SnowPipeline(viewer.getRenderer())
-    viewer.getRenderer().pipeline = snowPipeline
-    void snowPipeline.start()
   })
 
   viewer.on(ViewerEvent.UnloadComplete, () => {
diff --git a/packages/viewer/src/modules/SpeckleRenderer.ts b/packages/viewer/src/modules/SpeckleRenderer.ts
index 19e2ec096..6a2d6f379 100644
--- a/packages/viewer/src/modules/SpeckleRenderer.ts
+++ b/packages/viewer/src/modules/SpeckleRenderer.ts
@@ -605,7 +605,7 @@ export default class SpeckleRenderer {
     this.updateHelpers()
 
     /** We'll just update the shadowcatcher after all batches are loaded */
-    this.updateShadowCatcher()
+    this.updateShadowCatcher(true)
     this.updateClippingPlanes()
     if (this._speckleCamera) this._speckleCamera.updateCameraPlanes(this.sceneBox)
     delete this.cancel[renderTree.id]
@@ -641,7 +641,6 @@ export default class SpeckleRenderer {
 
   public removeRenderTree(subtreeId: string) {
     this.rootGroup.remove(this.rootGroup.getObjectByName(subtreeId) as Object3D)
-    this.updateShadowCatcher()
 
     const batches = this.batcher.getBatches(subtreeId)
     batches.forEach((value) => {
@@ -651,6 +650,7 @@ export default class SpeckleRenderer {
     this.batcher.purgeBatches(subtreeId)
     this.updateDirectLights()
     this.updateHelpers()
+    this.updateShadowCatcher(true)
   }
 
   public cancelRenderTree(subtreeId: string) {
@@ -844,14 +844,15 @@ export default class SpeckleRenderer {
     this._shadowcatcher?.updateClippingPlanes(planes)
   }
 
-  public updateShadowCatcher() {
+  public updateShadowCatcher(force: boolean = false) {
     if (this.sunConfiguration.shadowcatcher !== undefined)
       this._shadowcatcher.shadowcatcherMesh.visible =
         this.sunConfiguration.shadowcatcher
     if (this.sunConfiguration.shadowcatcher) {
       this._shadowcatcher.bake(
         this.clippingVolume,
-        this._renderer.capabilities.maxTextureSize
+        this._renderer.capabilities.maxTextureSize,
+        force
       )
       this.needsRender = true
     }
diff --git a/packages/viewer/src/modules/Viewer.ts b/packages/viewer/src/modules/Viewer.ts
index 0aaa79757..d0f77a118 100644
--- a/packages/viewer/src/modules/Viewer.ts
+++ b/packages/viewer/src/modules/Viewer.ts
@@ -366,7 +366,7 @@ export class Viewer extends EventEmitter implements IViewer {
         this.speckleRenderer.removeRenderTree(resource)
         this.tree.getRenderTree(resource)?.purge()
         this.tree.purge(resource)
-        this.requestRender(UpdateFlags.RENDER | UpdateFlags.SHADOWS)
+        this.requestRender(UpdateFlags.RENDER_RESET | UpdateFlags.SHADOWS)
       }
     } finally {
       if (--this.inProgressOperations === 0) {
diff --git a/packages/viewer/src/modules/extensions/CameraController.ts b/packages/viewer/src/modules/extensions/CameraController.ts
index 2f7adf2f4..da4783164 100644
--- a/packages/viewer/src/modules/extensions/CameraController.ts
+++ b/packages/viewer/src/modules/extensions/CameraController.ts
@@ -98,7 +98,7 @@ export const DefaultOrbitControlsOptions: Required<CameraControllerOptions> = {
   moveSpeed: 1,
   damperDecay: 30,
   enableLook: true,
-  nearPlaneCalculation: NearPlaneCalculation.EMPIRIC
+  nearPlaneCalculation: NearPlaneCalculation.ACCURATE
 }
 
 export class CameraController extends Extension implements SpeckleCamera {
diff --git a/utils/helm/speckle-server/templates/frontend_2/deployment.yml b/utils/helm/speckle-server/templates/frontend_2/deployment.yml
index 00809b8ba..d43fbf095 100644
--- a/utils/helm/speckle-server/templates/frontend_2/deployment.yml
+++ b/utils/helm/speckle-server/templates/frontend_2/deployment.yml
@@ -22,6 +22,12 @@ spec:
       - name: main
         image: {{ default (printf "speckle/speckle-frontend-2:%s" .Values.docker_image_tag) .Values.frontend_2.image }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
+        args: #overwrites the Dockerfile CMD statement
+          - "/nodejs/bin/node"
+        {{- if .Values.frontend_2.inspect.enabled }}
+          - {{ printf "--inspect=%s" .Values.frontend_2.inspect.port }}
+        {{- end }}
+          - "./server/index.mjs"
 
         ports:
           - name: www
diff --git a/utils/helm/speckle-server/values.schema.json b/utils/helm/speckle-server/values.schema.json
index ecba2e8c9..55f5d6934 100644
--- a/utils/helm/speckle-server/values.schema.json
+++ b/utils/helm/speckle-server/values.schema.json
@@ -1774,6 +1774,21 @@
           "description": "If enabled, will output logs in a human-readable format. Otherwise, logs will be output in JSON format.",
           "default": false
         },
+        "inspect": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "description": "If enabled, indicates that the Speckle FE2 should be deployed with the nodejs inspect feature enabled",
+              "default": false
+            },
+            "port": {
+              "type": "string",
+              "description": "The port on which the nodejs inspect feature should be exposed",
+              "default": "7000"
+            }
+          }
+        },
         "enabled": {
           "type": "boolean",
           "description": "Feature flag to enable running the new web application frontend.",
diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml
index 44a79e99a..8922b5b00 100644
--- a/utils/helm/speckle-server/values.yaml
+++ b/utils/helm/speckle-server/values.yaml
@@ -1062,6 +1062,11 @@ frontend_2:
   ## @param frontend_2.logPretty If enabled, will output logs in a human-readable format. Otherwise, logs will be output in JSON format.
   ##
   logPretty: false
+  inspect:
+    ## @param frontend_2.inspect.enabled If enabled, indicates that the Speckle FE2 should be deployed with the nodejs inspect feature enabled
+    enabled: false
+    ## @param frontend_2.inspect.port The port on which the nodejs inspect feature should be exposed
+    port: '7000'
   ## @param frontend_2.enabled Feature flag to enable running the new web application frontend.
   ##
   enabled: true
diff --git a/yarn.lock b/yarn.lock
index 002fa8234..092d9050d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -80,9 +80,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apollo/client@npm:^3.6.6, @apollo/client@npm:^3.7.0, @apollo/client@npm:^3.7.14, @apollo/client@npm:^3.8.0, @apollo/client@npm:^3.9.6":
-  version: 3.9.7
-  resolution: "@apollo/client@npm:3.9.7"
+"@apollo/client@npm:^3.12.4, @apollo/client@npm:^3.6.6, @apollo/client@npm:^3.7.0, @apollo/client@npm:^3.7.14, @apollo/client@npm:^3.8.0":
+  version: 3.12.4
+  resolution: "@apollo/client@npm:3.12.4"
   dependencies:
     "@graphql-typed-document-node/core": "npm:^3.1.1"
     "@wry/caches": "npm:^1.0.0"
@@ -92,7 +92,7 @@ __metadata:
     hoist-non-react-statics: "npm:^3.3.2"
     optimism: "npm:^0.18.0"
     prop-types: "npm:^15.7.2"
-    rehackt: "npm:0.0.6"
+    rehackt: "npm:^0.1.0"
     response-iterator: "npm:^0.2.6"
     symbol-observable: "npm:^4.0.0"
     ts-invariant: "npm:^0.10.3"
@@ -101,8 +101,8 @@ __metadata:
   peerDependencies:
     graphql: ^15.0.0 || ^16.0.0
     graphql-ws: ^5.5.5
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc
     subscriptions-transport-ws: ^0.9.0 || ^0.11.0
   peerDependenciesMeta:
     graphql-ws:
@@ -113,7 +113,7 @@ __metadata:
       optional: true
     subscriptions-transport-ws:
       optional: true
-  checksum: 10/d11ccdc5fc69e003c0ad2c6aa9c263823abce6c164bda726cfacbed0f94dfce366aa6bed0abc8c747420b24c3248f4a561a6007350d48373c62728bdbf3bdbcb
+  checksum: 10/9659ccf03ab5d6708cf191a1bd09c33ab5f958a8d66e783f81ccc899448b362a51cecf7d62c0ff5b852e60a340238e6903b3c96dcb5cf68dfb8a438ee6cd24bb
   languageName: node
   linkType: hard
 
@@ -15582,7 +15582,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sindresorhus/is@npm:^4.0.0":
+"@sindresorhus/is@npm:^4.0.0, @sindresorhus/is@npm:^4.6.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
   checksum: 10/e7f36ed72abfcd5e0355f7423a72918b9748bb1ef370a59f3e5ad8d40b728b85d63b272f65f63eec1faf417cda89dcb0aeebe94015647b6054659c1442fe5ce0
@@ -16837,7 +16837,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@speckle/frontend-2@workspace:packages/frontend-2"
   dependencies:
-    "@apollo/client": "npm:^3.9.6"
+    "@apollo/client": "npm:^3.12.4"
     "@artmizu/nuxt-prometheus": "npm:^2.2.1"
     "@babel/core": "npm:^7.19.6"
     "@babel/preset-env": "npm:^7.19.4"
@@ -16902,7 +16902,7 @@ __metadata:
     "@types/ua-parser-js": "npm:^0.7.39"
     "@typescript-eslint/eslint-plugin": "npm:^7.12.0"
     "@typescript-eslint/parser": "npm:^7.12.0"
-    "@vue/apollo-composable": "npm:4.0.2"
+    "@vue/apollo-composable": "npm:@speckle/apollo-composable@4.2.1-patch.1"
     "@vue/apollo-ssr": "npm:4.0.0"
     "@vueuse/core": "npm:^10.9.0"
     apollo-upload-client: "npm:^18.0.1"
@@ -16950,7 +16950,7 @@ __metadata:
     type-fest: "npm:^4.24.0"
     typescript: "npm:^4.8.3"
     ua-parser-js: "npm:^1.0.38"
-    vee-validate: "npm:^4.7.0"
+    vee-validate: "npm:4.7.0"
     vue-advanced-cropper: "npm:^2.8.8"
     vue-tippy: "npm:^6.0.0"
     vue-tsc: "npm:2.0.10"
@@ -17523,7 +17523,7 @@ __metadata:
     typescript: "npm:^5.0.4"
     unplugin-vue-macros: "npm:^2.7.0"
     v3-infinite-loading: "npm:^1.2.2"
-    vee-validate: "npm:^4.7.0"
+    vee-validate: "npm:4.7.0"
     vite: "npm:^4.5.2"
     vite-plugin-dts: "npm:^3.6.3"
     vue: "npm:^3.3.8"
@@ -17532,6 +17532,7 @@ __metadata:
     vue-tsc: "npm:^1.8.22"
     wait-on: "npm:^6.0.1"
   peerDependencies:
+    vee-validate: ^4.7.0
     vue: ^3.3.0
   languageName: unknown
   linkType: soft
@@ -22422,9 +22423,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/apollo-composable@npm:4.0.2":
-  version: 4.0.2
-  resolution: "@vue/apollo-composable@npm:4.0.2"
+"@vue/apollo-composable@npm:@speckle/apollo-composable@4.2.1-patch.1":
+  version: 4.2.1-patch.1
+  resolution: "@speckle/apollo-composable@npm:4.2.1-patch.1"
   dependencies:
     throttle-debounce: "npm:^5.0.0"
     ts-essentials: "npm:^9.4.0"
@@ -22437,17 +22438,17 @@ __metadata:
   peerDependenciesMeta:
     "@vue/composition-api":
       optional: true
-  checksum: 10/fc07bf29876d9852208b83c50b18771deaa60ddc7d4fbe0cdb2026dacf3bfafe098e8a6c7bb10cc99786ee3479dcfa2497406fbd505d142d45302590a8c12666
+  checksum: 10/f8816269d1e0294b817af863417a49bce353e0324a7c984f9c71a057d4b3415e1708ac6bf41907951a7fe467cf0a1dfacfec9e78db9985ba7f2773cbba0a2e38
   languageName: node
   linkType: hard
 
-"@vue/apollo-composable@npm:^4.0.0-alpha.19":
-  version: 4.0.0-beta.1
-  resolution: "@vue/apollo-composable@npm:4.0.0-beta.1"
+"@vue/apollo-composable@npm:^4.0.0-alpha.19, @vue/apollo-composable@npm:^4.0.0-beta.5":
+  version: 4.2.1
+  resolution: "@vue/apollo-composable@npm:4.2.1"
   dependencies:
-    throttle-debounce: "npm:^3.0.1"
-    ts-essentials: "npm:^9.1.2"
-    vue-demi: "npm:^0.13.1"
+    throttle-debounce: "npm:^5.0.0"
+    ts-essentials: "npm:^9.4.0"
+    vue-demi: "npm:^0.14.6"
   peerDependencies:
     "@apollo/client": ^3.4.13
     "@vue/composition-api": ^1.0.0
@@ -22456,26 +22457,7 @@ __metadata:
   peerDependenciesMeta:
     "@vue/composition-api":
       optional: true
-  checksum: 10/01d0bbfc8141cd30f9bad76b056de8a79f94853b3659f2e708ce7bc7a0a97e84ccc26aad65b6717ebbac44b713f954e2d0f8f0a0e86f0ecddbe74ba039fa6ab7
-  languageName: node
-  linkType: hard
-
-"@vue/apollo-composable@npm:^4.0.0-beta.5":
-  version: 4.0.0-beta.5
-  resolution: "@vue/apollo-composable@npm:4.0.0-beta.5"
-  dependencies:
-    throttle-debounce: "npm:^3.0.1"
-    ts-essentials: "npm:^9.1.2"
-    vue-demi: "npm:^0.13.1"
-  peerDependencies:
-    "@apollo/client": ^3.4.13
-    "@vue/composition-api": ^1.0.0
-    graphql: ">=15"
-    vue: ^2.6.0 || ^3.1.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-  checksum: 10/5dc1e7ff50cddb9c52077aaa589776e6a8646a3eef74f7adede207fc5f24d42c57d9ed6fbbdf3bb593acab3f25fc2edc797f79ac397dad03e95d6ee62c99deb2
+  checksum: 10/008e0ba6d549b2e1f2f7c85f42807120a9ffe8775b70ac3fd451fcfdc1c9fa6c9e37539954fddc931e12dd61428b1c20815534a274794b99f7bf3ccba7a5f80e
   languageName: node
   linkType: hard
 
@@ -22928,10 +22910,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/devtools-api@npm:^6.1.4":
-  version: 6.4.4
-  resolution: "@vue/devtools-api@npm:6.4.4"
-  checksum: 10/086fcc7a029601090fbdf89b7b6c8599b16656654e2af0d5612e42f439d0cde0ca211e9f7eee940290e38e3c3a144cbe8298af0bd46babf4873d1d79a2ddf64c
+"@vue/devtools-api@npm:^6.1.4, @vue/devtools-api@npm:^6.6.4":
+  version: 6.6.4
+  resolution: "@vue/devtools-api@npm:6.6.4"
+  checksum: 10/0fca4912b6ae0185b9375f5d113d417984077db0681c74cf39eb8522eb82c27f662a72e1ae3e0d79e105fdd0a99a7cbd65ed111465d238f60cce10922e02a812
   languageName: node
   linkType: hard
 
@@ -22942,13 +22924,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/devtools-api@npm:^6.6.4":
-  version: 6.6.4
-  resolution: "@vue/devtools-api@npm:6.6.4"
-  checksum: 10/0fca4912b6ae0185b9375f5d113d417984077db0681c74cf39eb8522eb82c27f662a72e1ae3e0d79e105fdd0a99a7cbd65ed111465d238f60cce10922e02a812
-  languageName: node
-  linkType: hard
-
 "@vue/devtools-core@npm:7.6.8":
   version: 7.6.8
   resolution: "@vue/devtools-core@npm:7.6.8"
@@ -24219,6 +24194,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-escapes@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "ansi-escapes@npm:6.2.1"
+  checksum: 10/3b064937dc8a0645ed8094bc8b09483ee718f3aa3139746280e6c2ea80e28c0a3ce66973d0f33e88e60021abbf67e5f877deabfc810e75edf8a19dfa128850be
+  languageName: node
+  linkType: hard
+
 "ansi-html-community@npm:^0.0.8":
   version: 0.0.8
   resolution: "ansi-html-community@npm:0.0.8"
@@ -27170,6 +27152,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"colors@npm:1.4.0":
+  version: 1.4.0
+  resolution: "colors@npm:1.4.0"
+  checksum: 10/90b2d5465159813a3983ea72ca8cff75f784824ad70f2cc2b32c233e95bcfbcda101ebc6d6766bc50f57263792629bfb4f1f8a4dfbd1d240f229fc7f69b785fc
+  languageName: node
+  linkType: hard
+
 "colors@npm:~1.2.1":
   version: 1.2.5
   resolution: "colors@npm:1.2.5"
@@ -30034,6 +30023,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"emojilib@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "emojilib@npm:2.4.0"
+  checksum: 10/bef767eca49acaa881388d91bee6936ea57ae367d603d5227ff0a9da3e2d1e774a61c447e5f2f4901797d023c4b5239bc208285b6172a880d3655024a0f44980
+  languageName: node
+  linkType: hard
+
 "emojis-list@npm:^3.0.0":
   version: 3.0.0
   resolution: "emojis-list@npm:3.0.0"
@@ -32713,6 +32709,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gar@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "gar@npm:1.0.4"
+  checksum: 10/6b1010b5c17056526298734bfa08716f111cd023394dbe32496841e2f7b0dfe9e742b8ddb56103c0867f2ae80f5f069262916e5398ac982467be4da240ba7bb9
+  languageName: node
+  linkType: hard
+
 "gauge@npm:^3.0.0":
   version: 3.0.2
   resolution: "gauge@npm:3.0.2"
@@ -32812,6 +32815,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-folder-size@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "get-folder-size@npm:4.0.0"
+  dependencies:
+    gar: "npm:^1.0.4"
+  bin:
+    get-folder-size: bin/get-folder-size.js
+  checksum: 10/424d0310dd3bf8f9f38dd686cca4201e162ce4569831a71de9cb018667e238c243bfbe6560c31f5898a4fe1783e8b7ae4bdc7ce151b317ea20c8ea85f284e7a2
+  languageName: node
+  linkType: hard
+
 "get-func-name@npm:^2.0.0, get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2":
   version: 2.0.2
   resolution: "get-func-name@npm:2.0.2"
@@ -41091,6 +41105,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-emoji@npm:^2.1.3":
+  version: 2.2.0
+  resolution: "node-emoji@npm:2.2.0"
+  dependencies:
+    "@sindresorhus/is": "npm:^4.6.0"
+    char-regex: "npm:^1.0.2"
+    emojilib: "npm:^2.4.0"
+    skin-tone: "npm:^2.0.0"
+  checksum: 10/2548668f5cc9f781c94dc39971a630b2887111e0970c29fc523e924819d1b39b53a2694a4d1046861adf538c4462d06ee0269c48717ccad30336a918d9a911d5
+  languageName: node
+  linkType: hard
+
 "node-fetch-native@npm:^1.0.1":
   version: 1.0.1
   resolution: "node-fetch-native@npm:1.0.1"
@@ -41456,6 +41482,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"npkill@npm:^0.12.2":
+  version: 0.12.2
+  resolution: "npkill@npm:0.12.2"
+  dependencies:
+    ansi-escapes: "npm:^6.2.1"
+    colors: "npm:1.4.0"
+    get-folder-size: "npm:^4.0.0"
+    node-emoji: "npm:^2.1.3"
+    open-file-explorer: "npm:^1.0.2"
+    rxjs: "npm:^7.8.1"
+  bin:
+    npkill: lib/index.js
+  checksum: 10/17a24fd5407adc1f4d43d34b525eae44657064f89f89283059a60cf9e528bcbf2f76fbd302bb4a6583abbda4f370a4e8cfe4cf2a4ca140fbf377332b01651fee
+  languageName: node
+  linkType: hard
+
 "npm-run-path@npm:^4.0.1":
   version: 4.0.1
   resolution: "npm-run-path@npm:4.0.1"
@@ -42073,6 +42115,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"open-file-explorer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "open-file-explorer@npm:1.0.2"
+  checksum: 10/a6e4e5944f12e3d5c6e883e3a9731a00687f9ca98821234a46f5f3e980f4f74748eedf4dcdaacfd02823f39ea4ab94fd9dddda1691f6e25c7c2098c687d3cd70
+  languageName: node
+  linkType: hard
+
 "open@npm:^10.1.0":
   version: 10.1.0
   resolution: "open@npm:10.1.0"
@@ -46438,9 +46487,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rehackt@npm:0.0.6":
-  version: 0.0.6
-  resolution: "rehackt@npm:0.0.6"
+"rehackt@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "rehackt@npm:0.1.0"
   peerDependencies:
     "@types/react": "*"
     react: "*"
@@ -46449,7 +46498,7 @@ __metadata:
       optional: true
     react:
       optional: true
-  checksum: 10/3897c93270836159406529e0fa983bf4a11c07d2efc5c8f6bdfd7f6821d3b84a30d911c3f3b9c689948739e6955c5835c8dd9d91579150bec5092f356c0d91df
+  checksum: 10/c81adead82c165dffc574cbf9e1de3605522782a56b48df48b68d53d45c4d8c9253df3790109335bf97072424e54ad2423bb9544ca3a985fa91995dda43452fc
   languageName: node
   linkType: hard
 
@@ -47349,6 +47398,7 @@ __metadata:
     husky: "npm:^7.0.4"
     lint-staged: "npm:^12.3.7"
     lockfile: "npm:^1.0.4"
+    npkill: "npm:^0.12.2"
     pino-pretty: "npm:^9.1.1"
     prettier: "npm:^2.5.1"
     ts-node: "npm:^10.9.1"
@@ -48157,6 +48207,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"skin-tone@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "skin-tone@npm:2.0.0"
+  dependencies:
+    unicode-emoji-modifier-base: "npm:^1.0.0"
+  checksum: 10/19de157586b8019cacc55eb25d9d640f00fc02415761f3e41a4527142970fd4e7f6af0333bc90e879858766c20a976107bb386ffd4c812289c01d51f2c8d182c
+  languageName: node
+  linkType: hard
+
 "slash@npm:^2.0.0":
   version: 2.0.0
   resolution: "slash@npm:2.0.0"
@@ -50480,15 +50539,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-essentials@npm:^9.1.2":
-  version: 9.2.0
-  resolution: "ts-essentials@npm:9.2.0"
-  peerDependencies:
-    typescript: ">=4.1.0"
-  checksum: 10/d8a661841c4a04c4b180ee63734541e5051d61d905cea3246ea35505e88a7b220ad583bba1095e4845a2aaf5570bf1a10c5b4580185f00c169e2943a3bea5f54
-  languageName: node
-  linkType: hard
-
 "ts-essentials@npm:^9.4.0":
   version: 9.4.0
   resolution: "ts-essentials@npm:9.4.0"
@@ -51214,6 +51264,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unicode-emoji-modifier-base@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "unicode-emoji-modifier-base@npm:1.0.0"
+  checksum: 10/6e1521d35fa69493207eb8b41f8edb95985d8b3faf07c01d820a1830b5e8403e20002563e2f84683e8e962a49beccae789f0879356bf92a4ec7a4dd8e2d16fdb
+  languageName: node
+  linkType: hard
+
 "unicode-match-property-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-match-property-ecmascript@npm:2.0.0"
@@ -52354,7 +52411,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vee-validate@npm:^4.7.0":
+"vee-validate@npm:4.7.0":
   version: 4.7.0
   resolution: "vee-validate@npm:4.7.0"
   dependencies:
@@ -53166,22 +53223,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue-demi@npm:^0.13.1":
-  version: 0.13.5
-  resolution: "vue-demi@npm:0.13.5"
-  peerDependencies:
-    "@vue/composition-api": ^1.0.0-rc.1
-    vue: ^3.0.0-0 || ^2.6.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-  bin:
-    vue-demi-fix: bin/vue-demi-fix.js
-    vue-demi-switch: bin/vue-demi-switch.js
-  checksum: 10/539a85d5a5751002bc86f073eb95613c5bd3bee37675c6dbc120a90595e7cfed40570c13f369566d87bbe2ac50203533844d9d49d2735f0f8cb1eb43a17fb393
-  languageName: node
-  linkType: hard
-
 "vue-demi@npm:^0.14.6":
   version: 0.14.6
   resolution: "vue-demi@npm:0.14.6"