chore(merge): sync master into dev/4.11.x

web/src/router.tsx

@@ -27,6 +27,8 @@ import ErrorPage from '@/components/ErrorPage';
 import BackendUnavailablePage from '@/components/BackendUnavailablePage';
 import PluginPagesPage from '@/app/home/plugin-pages/page';
 import RootLayout from '@/app/RootLayout';
+import AcceptInvitationPage from '@/app/invitations/accept/page';
+import WorkspaceSelectPage from '@/app/workspaces/select/page';
 
 const Loading = () => <div>Loading...</div>;
 
@@ -63,6 +65,14 @@ export const router = createBrowserRouter([
           </ResetPasswordLayout>
         ),
       },
+      {
+        path: '/invitations/accept',
+        element: <AcceptInvitationPage />,
+      },
+      {
+        path: '/workspaces/select',
+        element: <WorkspaceSelectPage />,
+      },
       {
         path: '/wizard',
         element: <WizardPage />,