diff --git a/edb/buildmeta.py b/edb/buildmeta.py
index a0e92912f03..7c74c25cf57 100644
--- a/edb/buildmeta.py
+++ b/edb/buildmeta.py
@@ -55,7 +55,7 @@
 
 
 # Increment this whenever the database layout or stdlib changes.
-EDGEDB_CATALOG_VERSION = 2024_02_28_00_00
+EDGEDB_CATALOG_VERSION = 2024_03_04_00_00
 EDGEDB_MAJOR_VERSION = 6
 
 
diff --git a/edb/edgeql/compiler/schemactx.py b/edb/edgeql/compiler/schemactx.py
index 62167c6d50b..f0a1c918c0e 100644
--- a/edb/edgeql/compiler/schemactx.py
+++ b/edb/edgeql/compiler/schemactx.py
@@ -242,6 +242,7 @@ def derive_view(
                 mark_derived=True,
                 transient=True,
                 attrs=attrs,
+                stdmode=ctx.env.options.bootstrap_mode,
             )
 
         if (
diff --git a/edb/lib/cfg.edgeql b/edb/lib/cfg.edgeql
index e3703525497..2bfb89017d0 100644
--- a/edb/lib/cfg.edgeql
+++ b/edb/lib/cfg.edgeql
@@ -264,6 +264,7 @@ ALTER TYPE cfg::AbstractConfig {
 CREATE TYPE cfg::Config EXTENDING cfg::AbstractConfig;
 CREATE TYPE cfg::InstanceConfig EXTENDING cfg::AbstractConfig;
 CREATE TYPE cfg::DatabaseConfig EXTENDING cfg::AbstractConfig;
+CREATE ALIAS cfg::BranchConfig := cfg::DatabaseConfig;
 
 
 CREATE FUNCTION
diff --git a/edb/schema/expraliases.py b/edb/schema/expraliases.py
index 2d531e411de..f3c25daf32e 100644
--- a/edb/schema/expraliases.py
+++ b/edb/schema/expraliases.py
@@ -463,6 +463,7 @@ def compile_alias_expr(
             modaliases=context.modaliases,
             schema_view_mode=True,
             in_ddl_context_name='alias definition',
+            bootstrap_mode=context.stdmode,
         ),
     )
 
diff --git a/edb/schema/types.py b/edb/schema/types.py
index 05deb613a27..8d792cb7c85 100644
--- a/edb/schema/types.py
+++ b/edb/schema/types.py
@@ -173,6 +173,7 @@ def derive_subtype(
         inheritance_merge: bool = True,
         transient: bool = False,
         inheritance_refdicts: Optional[AbstractSet[str]] = None,
+        stdmode: bool = False,
         **kwargs: Any,
     ) -> typing.Tuple[s_schema.Schema, TypeT]:
 
@@ -202,6 +203,7 @@ def derive_subtype(
         context = sd.CommandContext(
             modaliases={},
             schema=schema,
+            stdmode=stdmode,
         )
 
         delta = sd.DeltaRoot()
diff --git a/tests/test_server_config.py b/tests/test_server_config.py
index 17bbb4f6716..5355c27a8e5 100644
--- a/tests/test_server_config.py
+++ b/tests/test_server_config.py
@@ -854,7 +854,7 @@ async def test_server_proto_configure_05(self):
 
         await self.assert_query_result(
             '''
-            SELECT cfg::DatabaseConfig.__internal_sess_testvalue
+            SELECT cfg::BranchConfig.__internal_sess_testvalue
             ''',
             [
                 3