diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 11079376ae2..9de81aac317 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -368,6 +368,7 @@ heap_create(const char *relname,
 	if (!allow_system_table_mods &&
 		((IsCatalogNamespace(relnamespace) && relkind != RELKIND_INDEX) ||
 		 IsToastNamespace(relnamespace) ||
+		 IsExtAuxNamespace(relnamespace) ||
 		 IsAoSegmentNamespace(relnamespace)) &&
 		IsNormalProcessingMode())
 		ereport(ERROR,
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 7ac042ab4fd..1cb10c8d7f5 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -3695,7 +3695,7 @@ RelationBuildLocalRelation(const char *relname,
 			rel->rd_islocaltemp = false;
 			break;
 		case RELPERSISTENCE_TEMP:
-			Assert(isTempOrTempToastNamespace(relnamespace));
+			Assert(relnamespace == PG_EXTAUX_NAMESPACE || isTempOrTempToastNamespace(relnamespace));
 			rel->rd_backend = BackendIdForTempRelations();
 			rel->rd_islocaltemp = true;
 			break;
diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h
index 2f514b8c05c..a4090f0d2fa 100644
--- a/src/include/catalog/dependency.h
+++ b/src/include/catalog/dependency.h
@@ -142,9 +142,9 @@ typedef enum ObjectClass
 
 	/* GPDB additions */
 	OCLASS_PROFILE,                         /* pg_profile */
-        OCLASS_PASSWORDHISTORY,                 /* pg_password_history */
+	OCLASS_PASSWORDHISTORY,                 /* pg_password_history */
 	OCLASS_EXTPROTOCOL,			/* pg_extprotocol */
-	OCLASS_TASK					/* pg_task */
+	OCLASS_TASK,				/* pg_task */
 } ObjectClass;
 
 #define LAST_OCLASS		OCLASS_TASK