diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index d9ad7e7d7..ff1c206da 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -470,7 +470,7 @@ export default {
                 self,
                 globalPT,
                 key !== 'transition' && {
-                    ...(key === 'root' && this.$.type.name === this.$options.hostName && { [`${datasetPrefix}name`]: ObjectUtils.toFlatCase(this.$.type.name) }),
+                    ...(key === 'root' && { [`${datasetPrefix}name`]: ObjectUtils.toFlatCase(this.$.type.name) }),
                     [`${datasetPrefix}section`]: ObjectUtils.toFlatCase(key)
                 }
             );
diff --git a/components/lib/datatable/TableBody.vue b/components/lib/datatable/TableBody.vue
index 94e6bd99b..784fba371 100755
--- a/components/lib/datatable/TableBody.vue
+++ b/components/lib/datatable/TableBody.vue
@@ -10,7 +10,7 @@
                     role="row"
                     v-bind="ptm('rowGroupHeader')"
                 >
-                    <td :colspan="columnsLength - 1" v-bind="{ ...getColumnPT('root'), ...getColumnPT('bodyCell') }" data-pc-section="bodycell">
+                    <td :colspan="columnsLength - 1" v-bind="ptm('rowGroupHeaderCell')">
                         <button v-if="expandableRowGroups" :class="cx('rowGroupToggler')" @click="onRowGroupToggle($event, rowData)" type="button" v-bind="ptm('rowGroupToggler')">
                             <component v-if="templates['rowgrouptogglericon']" :is="templates['rowgrouptogglericon']" :expanded="isRowGroupExpanded(rowData)" />
                             <template v-else>
@@ -91,7 +91,7 @@
                     role="row"
                     v-bind="ptm('rowExpansion')"
                 >
-                    <td :colspan="columnsLength" v-bind="{ ...getColumnPT('root'), ...getColumnPT('bodyCell') }">
+                    <td :colspan="columnsLength" v-bind="ptm('rowExpansionCell')">
                         <component :is="templates['expansion']" :data="rowData" :index="getRowIndex(index)" />
                     </td>
                 </tr>
@@ -102,14 +102,14 @@
                     role="row"
                     v-bind="ptm('rowGroupFooter')"
                 >
-                    <td :colspan="columnsLength - 1" v-bind="{ ...getColumnPT('root'), ...getColumnPT('footerCell') }" data-pc-section="footercell">
+                    <td :colspan="columnsLength - 1" v-bind="ptm('rowGroupFooterCell')">
                         <component :is="templates['groupfooter']" :data="rowData" :index="getRowIndex(index)" />
                     </td>
                 </tr>
             </template>
         </template>
         <tr v-else :class="cx('emptyMessage')" role="row" v-bind="ptm('emptyMessage')">
-            <td :colspan="columnsLength" v-bind="{ ...getColumnPT('root'), ...getColumnPT('bodyCell') }">
+            <td :colspan="columnsLength" v-bind="ptm('emptyMessageCell')">
                 <component v-if="templates.empty" :is="templates.empty" />
             </td>
         </tr>
@@ -121,7 +121,6 @@ import BaseComponent from 'primevue/basecomponent';
 import ChevronDownIcon from 'primevue/icons/chevrondown';
 import ChevronRightIcon from 'primevue/icons/chevronright';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
-import { mergeProps } from 'vue';
 import BodyCell from './BodyCell.vue';
 
 export default {
@@ -307,16 +306,6 @@ export default {
         columnProp(col, prop) {
             return ObjectUtils.getVNodeProp(col, prop);
         },
-        getColumnPT(key) {
-            const columnMetaData = {
-                parent: {
-                    props: this.$props,
-                    state: this.$data
-                }
-            };
-
-            return mergeProps(this.ptm(`column.${key}`, { column: columnMetaData }), this.ptm(`column.${key}`, columnMetaData), this.ptmo(this.getColumnProp({}), key, columnMetaData));
-        },
         getColumnProp(column) {
             return column.props && column.props.pt ? column.props.pt : undefined; //@todo
         },
diff --git a/doc/datatable/BasicDoc.vue b/doc/datatable/BasicDoc.vue
index 1372c146b..135b056ff 100644
--- a/doc/datatable/BasicDoc.vue
+++ b/doc/datatable/BasicDoc.vue
@@ -8,14 +8,15 @@
             <Column field="name" header="Name"></Column>
             <Column field="category" header="Category"></Column>
             <Column field="quantity" header="Quantity"></Column>
+            <template #empty>
+                <p>Empty DataTable</p>
+            </template>
         </DataTable>
     </div>
     <DocSectionCode :code="code" :service="['ProductService']" />
 </template>
 
 <script>
-import { ProductService } from '@/service/ProductService';
-
 export default {
     data() {
         return {
@@ -93,7 +94,7 @@ const products = ref();
         };
     },
     mounted() {
-        ProductService.getProductsMini().then((data) => (this.products = data));
+        // ProductService.getProductsMini().then((data) => (this.products = data));
     }
 };
 </script>
diff --git a/doc/passthrough/UsePassThroughDoc.vue b/doc/passthrough/UsePassThroughDoc.vue
index 5917539be..9d6427803 100644
--- a/doc/passthrough/UsePassThroughDoc.vue
+++ b/doc/passthrough/UsePassThroughDoc.vue
@@ -39,7 +39,7 @@ const CustomTailwind = usePassThrough(
     },
     {
         mergeSections: true,
-        useMergeProps: false
+        mergeProps: false
     }
 );