diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index e915e004ee..bfc6852a97 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -1202,6 +1202,16 @@ export const Page: ({
   children,
 }: PropsWithChildren<Props_21>) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "IProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "PageWithHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const PageWithHeader: ({
+  themeId,
+  children,
+  ...props
+}: React_2.PropsWithChildren<IProps>) => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "Progress" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index a85954906a..b3169d5c29 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -30,7 +30,7 @@ export function AboutCard({ variant }: AboutCardProps): JSX.Element;
 // Warning: (ae-missing-release-tag) "AboutContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const AboutContent: ({ entity }: Props_2) => JSX.Element;
+export const AboutContent: ({ entity }: Props) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "AboutField" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -41,29 +41,32 @@ export const AboutField: ({
   value,
   gridSizes,
   children,
-}: Props_3) => JSX.Element;
+}: Props_2) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "CatalogEntityPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const CatalogEntityPage: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "IProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CatalogFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const CatalogFilter: ({
+  initiallySelectedFilter,
+  initialFilter,
+}: IProps) => JSX.Element;
+
 // Warning: (ae-forgotten-export) The symbol "CatalogPageProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "CatalogIndexPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const CatalogIndexPage: ({
-  initiallySelectedFilter,
   columns,
   actions,
+  initiallySelectedFilter,
 }: CatalogPageProps) => JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "CatalogLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const CatalogLayout: ({ children }: Props) => JSX.Element;
-
 // Warning: (ae-missing-release-tag) "catalogPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -110,11 +113,6 @@ export type CatalogTableRow = {
   };
 };
 
-// Warning: (ae-missing-release-tag) "CreateComponentButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const CreateComponentButton: () => JSX.Element | null;
-
 // Warning: (ae-missing-release-tag) "createMetadataDescriptionColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -287,6 +285,21 @@ export const EntitySwitch: {
 // @public (undocumented)
 export const EntitySystemDiagramCard: SystemDiagramCard;
 
+// Warning: (ae-missing-release-tag) "FilterContainer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const FilterContainer: ({
+  children,
+}: React_2.PropsWithChildren<{}>) => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "IProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "FilteredTableLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const FilteredTableLayout: ({
+  children,
+}: React_2.PropsWithChildren<IProps_2>) => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "isComponentType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -316,6 +329,13 @@ export const Router: ({
   EntityPage?: React_2.ComponentType<{}> | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TableContainer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const TableContainer: ({
+  children,
+}: React_2.PropsWithChildren<{}>) => JSX.Element;
+
 // Warnings were encountered during analysis:
 //
 // src/components/CatalogTable/CatalogTable.d.ts:10:5 - (ae-forgotten-export) The symbol "CatalogTableProps" needs to be exported by the entry point index.d.ts