diff --git a/packages/dx-react-grid-bootstrap3/src/plugins/table-group-row.jsx b/packages/dx-react-grid-bootstrap3/src/plugins/table-group-row.jsx
index 83d3c93fc2..5bb06fa8e0 100644
--- a/packages/dx-react-grid-bootstrap3/src/plugins/table-group-row.jsx
+++ b/packages/dx-react-grid-bootstrap3/src/plugins/table-group-row.jsx
@@ -1,15 +1,13 @@
 import React from 'react';
 
 import { TableGroupRow as TableGroupRowBase } from '@devexpress/dx-react-grid';
-import { TableGroupCell, TableGroupIndentCell } from '../templates/table-group-row-cell';
+import { TableGroupCell } from '../templates/table-group-row-cell';
 
 const groupCellTemplate = props => <TableGroupCell {...props} />;
-const groupIndentCellTemplate = props => <TableGroupIndentCell {...props} />;
 
 export const TableGroupRow = props => (
   <TableGroupRowBase
     groupCellTemplate={groupCellTemplate}
-    groupIndentCellTemplate={groupIndentCellTemplate}
     groupIndentColumnWidth={20}
     {...props}
   />
diff --git a/packages/dx-react-grid-bootstrap3/src/plugins/table-view.jsx b/packages/dx-react-grid-bootstrap3/src/plugins/table-view.jsx
index 92e5f1951d..1172a15365 100644
--- a/packages/dx-react-grid-bootstrap3/src/plugins/table-view.jsx
+++ b/packages/dx-react-grid-bootstrap3/src/plugins/table-view.jsx
@@ -4,10 +4,14 @@ import { combineTemplates } from '@devexpress/dx-react-core';
 import { TableView as TableViewBase } from '@devexpress/dx-react-grid';
 import { Table } from '../templates/table';
 import { TableCell } from '../templates/table-cell';
+import { TableStubCell } from '../templates/table-stub-cell';
+import { TableStubHeaderCell } from '../templates/table-stub-header-cell';
 import { TableNoDataCell } from '../templates/table-no-data-cell';
 
 const tableTemplate = props => <Table {...props} />;
 const defaultCellTemplate = props => <TableCell {...props} />;
+const stubCellTemplate = props => <TableStubCell {...props} />;
+const stubHeaderCellTemplate = props => <TableStubHeaderCell {...props} />;
 const noDataCellTemplate = props => <TableNoDataCell {...props} />;
 
 export const TableView = ({ tableCellTemplate, ...props }) => (
@@ -17,6 +21,8 @@ export const TableView = ({ tableCellTemplate, ...props }) => (
       tableCellTemplate,
       defaultCellTemplate,
     )}
+    tableStubCellTemplate={stubCellTemplate}
+    tableStubHeaderCellTemplate={stubHeaderCellTemplate}
     tableNoDataCellTemplate={noDataCellTemplate}
     {...props}
   />
diff --git a/packages/dx-react-grid-bootstrap3/src/templates/table-filter-cell.jsx b/packages/dx-react-grid-bootstrap3/src/templates/table-filter-cell.jsx
index c65ed1ce55..aa74bdb7b1 100644
--- a/packages/dx-react-grid-bootstrap3/src/templates/table-filter-cell.jsx
+++ b/packages/dx-react-grid-bootstrap3/src/templates/table-filter-cell.jsx
@@ -1,33 +1,29 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export const TableFilterCell = ({ style, column, filter, setFilter }) => (
+export const TableFilterCell = ({ style, filter, setFilter }) => (
   <th
     style={{
       fontWeight: 'normal',
       ...style,
     }}
   >
-    {!column.type && (
-      <input
-        type="text"
-        className="form-control"
-        value={filter ? filter.value : ''}
-        onChange={e => setFilter({ value: e.target.value })}
-      />
-    )}
+    <input
+      type="text"
+      className="form-control"
+      value={filter ? filter.value : ''}
+      onChange={e => setFilter({ value: e.target.value })}
+    />
   </th>
 );
 
 TableFilterCell.propTypes = {
-  column: PropTypes.object,
   style: PropTypes.object,
   filter: PropTypes.object,
   setFilter: PropTypes.func,
 };
 
 TableFilterCell.defaultProps = {
-  column: {},
   style: null,
   filter: null,
   setFilter: () => {},
diff --git a/packages/dx-react-grid-bootstrap3/src/templates/table-group-row-cell.jsx b/packages/dx-react-grid-bootstrap3/src/templates/table-group-row-cell.jsx
index c7e639d859..93fe1b7f90 100644
--- a/packages/dx-react-grid-bootstrap3/src/templates/table-group-row-cell.jsx
+++ b/packages/dx-react-grid-bootstrap3/src/templates/table-group-row-cell.jsx
@@ -37,25 +37,3 @@ TableGroupCell.defaultProps = {
   isExpanded: false,
   toggleGroupExpanded: () => {},
 };
-
-export const TableGroupIndentCell = ({ column, style }) => (
-  <td
-    style={{
-      ...style,
-      width: column.width,
-    }}
-  >
-    &nbsp;
-  </td>
-);
-
-TableGroupIndentCell.propTypes = {
-  style: PropTypes.object,
-  column: PropTypes.shape({
-    width: PropTypes.number.isRequired,
-  }).isRequired,
-};
-
-TableGroupIndentCell.defaultProps = {
-  style: {},
-};
diff --git a/packages/dx-react-grid-bootstrap3/src/templates/table-stub-cell.jsx b/packages/dx-react-grid-bootstrap3/src/templates/table-stub-cell.jsx
new file mode 100644
index 0000000000..68a526c7e5
--- /dev/null
+++ b/packages/dx-react-grid-bootstrap3/src/templates/table-stub-cell.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+export const TableStubCell = ({ style }) => (
+  <td style={style} />
+);
+
+TableStubCell.propTypes = {
+  style: PropTypes.shape(),
+};
+
+TableStubCell.defaultProps = {
+  style: null,
+};
diff --git a/packages/dx-react-grid-bootstrap3/src/templates/table-stub-header-cell.jsx b/packages/dx-react-grid-bootstrap3/src/templates/table-stub-header-cell.jsx
new file mode 100644
index 0000000000..91fd3e2fa9
--- /dev/null
+++ b/packages/dx-react-grid-bootstrap3/src/templates/table-stub-header-cell.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+export const TableStubHeaderCell = ({ style }) => (
+  <th style={style} />
+);
+
+TableStubHeaderCell.propTypes = {
+  style: PropTypes.shape(),
+};
+
+TableStubHeaderCell.defaultProps = {
+  style: null,
+};
diff --git a/packages/dx-react-grid-material-ui/src/plugins/table-group-row.jsx b/packages/dx-react-grid-material-ui/src/plugins/table-group-row.jsx
index 8260c60bd6..a8e78da743 100644
--- a/packages/dx-react-grid-material-ui/src/plugins/table-group-row.jsx
+++ b/packages/dx-react-grid-material-ui/src/plugins/table-group-row.jsx
@@ -1,15 +1,13 @@
 import React from 'react';
 
 import { TableGroupRow as TableGroupRowBase } from '@devexpress/dx-react-grid';
-import { TableGroupCell, TableGroupIndentCell } from '../templates/table-group-row-cell';
+import { TableGroupCell } from '../templates/table-group-row-cell';
 
 const groupCellTemplate = props => <TableGroupCell {...props} />;
-const groupIndentCellTemplate = props => <TableGroupIndentCell {...props} />;
 
 export const TableGroupRow = props => (
   <TableGroupRowBase
     groupCellTemplate={groupCellTemplate}
-    groupIndentCellTemplate={groupIndentCellTemplate}
     groupIndentColumnWidth={24}
     {...props}
   />
diff --git a/packages/dx-react-grid-material-ui/src/plugins/table-view.jsx b/packages/dx-react-grid-material-ui/src/plugins/table-view.jsx
index 49e40dfd1b..3313e96a42 100644
--- a/packages/dx-react-grid-material-ui/src/plugins/table-view.jsx
+++ b/packages/dx-react-grid-material-ui/src/plugins/table-view.jsx
@@ -4,10 +4,12 @@ import { combineTemplates } from '@devexpress/dx-react-core';
 import { TableView as TableViewBase } from '@devexpress/dx-react-grid';
 import { Table } from '../templates/table';
 import { TableCell } from '../templates/table-cell';
+import { TableStubCell } from '../templates/table-stub-cell';
 import { TableNoDataCell } from '../templates/table-no-data-cell';
 
 const tableTemplate = props => <Table {...props} />;
 const defaultCellTemplate = props => <TableCell {...props} />;
+const stubCellTemplate = props => <TableStubCell {...props} />;
 const noDataCellTemplate = props => <TableNoDataCell {...props} />;
 
 export const TableView = ({ tableCellTemplate, ...props }) => (
@@ -17,6 +19,8 @@ export const TableView = ({ tableCellTemplate, ...props }) => (
       tableCellTemplate,
       defaultCellTemplate,
     )}
+    tableStubCellTemplate={stubCellTemplate}
+    tableStubHeaderCellTemplate={stubCellTemplate}
     tableNoDataCellTemplate={noDataCellTemplate}
     {...props}
   />
diff --git a/packages/dx-react-grid-material-ui/src/templates/table-filter-cell.jsx b/packages/dx-react-grid-material-ui/src/templates/table-filter-cell.jsx
index a7bcba382f..1a9b08e4b5 100644
--- a/packages/dx-react-grid-material-ui/src/templates/table-filter-cell.jsx
+++ b/packages/dx-react-grid-material-ui/src/templates/table-filter-cell.jsx
@@ -16,24 +16,21 @@ const styleSheet = createStyleSheet('TableFilterCell', theme => ({
   },
 }));
 
-const TableFilterCellBase = ({ style, column, filter, setFilter, classes }) => (
+const TableFilterCellBase = ({ style, filter, setFilter, classes }) => (
   <TableCell
     className={classes.cell}
     style={style}
   >
-    {!column.type && (
-      <Input
-        className={classes.input}
-        value={filter ? filter.value : ''}
-        placeholder={'Filter...'}
-        onChange={e => setFilter({ value: e.target.value })}
-      />
-    )}
+    <Input
+      className={classes.input}
+      value={filter ? filter.value : ''}
+      placeholder={'Filter...'}
+      onChange={e => setFilter({ value: e.target.value })}
+    />
   </TableCell>
 );
 
 TableFilterCellBase.propTypes = {
-  column: PropTypes.object,
   style: PropTypes.object,
   filter: PropTypes.object,
   setFilter: PropTypes.func,
@@ -41,7 +38,6 @@ TableFilterCellBase.propTypes = {
 };
 
 TableFilterCellBase.defaultProps = {
-  column: {},
   style: null,
   filter: null,
   setFilter: () => {},
diff --git a/packages/dx-react-grid-material-ui/src/templates/table-group-row-cell.jsx b/packages/dx-react-grid-material-ui/src/templates/table-group-row-cell.jsx
index 56245d40fd..c41c8b9972 100644
--- a/packages/dx-react-grid-material-ui/src/templates/table-group-row-cell.jsx
+++ b/packages/dx-react-grid-material-ui/src/templates/table-group-row-cell.jsx
@@ -74,30 +74,3 @@ TableGroupCellBase.defaultProps = {
 };
 
 export const TableGroupCell = withStyles(styleSheet)(TableGroupCellBase);
-
-const TableGroupIndentCellBase = ({ column, style, classes }) => (
-  <TableCell
-    style={{
-      width: column.width,
-      ...style,
-    }}
-    className={classes.indentCell}
-  >
-    &nbsp;
-  </TableCell>
-);
-
-TableGroupIndentCellBase.propTypes = {
-  style: PropTypes.object,
-  column: PropTypes.shape({
-    width: PropTypes.number.isRequired,
-  }).isRequired,
-  classes: PropTypes.object.isRequired,
-};
-
-TableGroupIndentCellBase.defaultProps = {
-  style: {},
-};
-
-export const TableGroupIndentCell = withStyles(styleSheet)(TableGroupIndentCellBase);
-
diff --git a/packages/dx-react-grid-material-ui/src/templates/table-stub-cell.jsx b/packages/dx-react-grid-material-ui/src/templates/table-stub-cell.jsx
new file mode 100644
index 0000000000..61294bc2e8
--- /dev/null
+++ b/packages/dx-react-grid-material-ui/src/templates/table-stub-cell.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { TableCell } from 'material-ui';
+import { withStyles, createStyleSheet } from 'material-ui/styles';
+
+const styleSheet = createStyleSheet('TableStubCell', () => ({
+  cell: {
+    padding: 0,
+  },
+}));
+
+const TableStubCellBase = ({ style, classes }) => (
+  <TableCell
+    style={style}
+    className={classes.cell}
+  />
+);
+
+TableStubCellBase.propTypes = {
+  style: PropTypes.object,
+  classes: PropTypes.object.isRequired,
+};
+
+TableStubCellBase.defaultProps = {
+  style: {},
+};
+
+export const TableStubCell = withStyles(styleSheet)(TableStubCellBase);
diff --git a/packages/dx-react-grid/docs/reference/table-group-row.md b/packages/dx-react-grid/docs/reference/table-group-row.md
index e8ee6afde6..4497265d5f 100644
--- a/packages/dx-react-grid/docs/reference/table-group-row.md
+++ b/packages/dx-react-grid/docs/reference/table-group-row.md
@@ -14,21 +14,21 @@ A plugin that renders group rows with the capability to expand and collapse them
 Name | Type | Default | Description
 -----|------|---------|------------
 groupCellTemplate | (args: [GroupCellArgs](#group-cell-args)) => ReactElement | | A component that renders a group row
-groupIndentCellTemplate | (args: [GroupIndentCellArgs](#group-indent-cell-args)) => ReactElement | | A component that renders a group indent cell
+groupIndentCellTemplate | (args: [GroupIndentCellArgs](#group-indent-cell-args)) => ReactElement | null | A component that renders a group indent cell
 groupIndentColumnWidth | number | | Width of the group indent columns
 
 ## Interfaces
 
 ### <a name="group-cell-args"></a>GroupCellArgs
 
-Describes properties passed to the template that renders a group row.
+Describes the properties passed to the template that renders a group row.
 
 A value with the following shape:
 
 Field | Type | Description
 ------|------|------------
 row | [GroupRow](#group-row) | A group row data object
-isExpanded | boolean | Specifies whether or not a row is expanded
+isExpanded | boolean | Specifies if a row is expanded
 toggleGroupExpanded | () => void | Toggles the expanded state of a group row
 
 ### <a name="group-indent-cell-args"></a>GroupIndentCellArgs
diff --git a/packages/dx-react-grid/docs/reference/table-view.md b/packages/dx-react-grid/docs/reference/table-view.md
index 67d1ec95b1..985e159561 100644
--- a/packages/dx-react-grid/docs/reference/table-view.md
+++ b/packages/dx-react-grid/docs/reference/table-view.md
@@ -15,25 +15,27 @@ Name | Type | Default | Description
 -----|------|---------|------------
 tableTemplate | (args: [TableArgs](#table-args)) => ReactElement | | Renders a table using the specified parameters
 tableCellTemplate | (args: [TableCellArgs](#table-cell-args)) => ReactElement | | Renders a table cell using the specified parameters
-tableNoDataCellTemplate | (args: Object) => ReactElement | | Renders a table cell for an empty state using the specified parameters
-allowColumnReordering | boolean | false | If true, allows an end-user to change the column order by dragging
+tableNoDataCellTemplate | (args: [TableNoDataCellArgs](#table-no-data-cell-args)) => ReactElement | | Renders a table cell using the specified parameters when the table is empty
+tableStubCellTemplate | (args: [TableStubCellArgs](#table-stub-cell-args)) => ReactElement | | Renders a stub table cell if the cell data is not provided
+tableStubHeaderCellTemplate | (args: [TableStubHeaderCellArgs](#table-stub-header-cell-args)) => ReactElement | | Renders a stub header cell if the cell data is not provided
+allowColumnReordering | boolean | false | If true, allows an end-user to change the column's order by dragging it
 
 ## Interfaces
 
 ### <a name="table-args"></a>TableArgs
 
-Describes properties passed to the table template when it is being rendered
+Describes properties passed to the table template when it is being rendered.
 
 Field | Type | Description
 ------|------|------------
-headerRows | Array&lt;[TableRow](#table-row)&gt; | Specifies rows that should be rendered within the table header
-bodyRows | Array&lt;[TableRow](#table-row)&gt; | Specifies rows that should be rendered within the table body
+headerRows | Array&lt;[TableRow](#table-row)&gt; | Specifies rows rendered in the table header
+bodyRows | Array&lt;[TableRow](#table-row)&gt; | Specifies rows rendered in the table body
 columns | Array&lt;[TableColumn](#table-column)&gt; | Specifies the rendered table columns
-cellTemplate | (args: [CellArgs](#cell-args)) => ReactElement | The template that should be used to render table cells
+cellTemplate | (args: [CellArgs](#cell-args)) => ReactElement | The template used to render table cells
 
 ### <a name="cell-args"></a>CellArgs
 
-Describes properties passed to a cell template when it is being rendered
+Describes properties passed to a cell template when it is being rendered.
 
 A value with the following shape:
 
@@ -41,19 +43,46 @@ Field | Type | Description
 ------|------|------------
 row | [TableRow](#table-row) | Specifies a table row
 column | [TableColumn](#table-column) | Specifies a table column
+style? | Object | Specifies cell styles
 
 ### <a name="table-cell-args"></a>TableCellArgs
 
-Describes properties passed to the table cell template when it is being rendered
+Describes properties passed to the table cell template when it is being rendered.
 
 Field | Type | Description
 ------|------|------------
 row | [TableRow](#table-row) | Specifies a table row
 column | [TableColumn](#table-column) | Specifies a table column
+style? | Object | Specifies cell styles
+
+### <a name="table-no-data-cell-args"></a>TableNoDataCellArgs
+
+Describes properties passed to the table cell being rendered when using an empty template.
+
+Field | Type | Description
+------|------|------------
+style? | Object | Specifies cell styles
+colspan? | number | Specifies the number of columns the cell spans
+
+### <a name="table-stub-cell-args"></a>TableStubCellArgs
+
+Describes properties passed to the stub table cell template being rendered.
+
+Field | Type | Description
+------|------|------------
+style? | Object | Specifies cell styles
+
+### <a name="table-stub-header-cell-args"></a>TableStubHeaderCellArgs
+
+Describes properties passed to the stub header cell template being rendered.
+
+Field | Type | Description
+------|------|------------
+style? | Object | Specifies cell styles
 
 ### <a name="table-row"></a>TableRow
 
-Describes properties of a table row that is rendered by the TableView plugin
+Describes properties of a table row rendered by the TableView plugin.
 
 Extends [Row](grid.md#row)
 
@@ -61,11 +90,11 @@ A value with the following shape:
 
 Field | Type | Description
 ------|------|------------
-type? | string | Specifies the table row type. Used to identify a cell template for a rendered row. The type is not defined for rows passed by a user.
+type? | string | Specifies the table row type. Defines a cell template used to render a row. The type is not defined for rows passed by a user.
 
 ### <a name="table-column"></a>TableColumn
 
-Describes table column properties taken into account by the TableView plugin
+Describes table column properties that the TableView plugin takes into account.
 
 Extends [Column](grid.md#column)
 
@@ -73,7 +102,7 @@ A value with the following shape:
 
 Field | Type | Description
 ------|------|------------
-type? | string | Specifies the table column type. Used to identify a cell template to render a column cell. The type property is not defined for data rows
+type? | string | Specifies the table column type. Defines a cell template used to render a cell. The type is not defined for data rows
 
 ## Plugin Developer Reference
 
@@ -91,6 +120,5 @@ Name | Plugin | Type | Description
 tableHeaderRows | Getter | () => Array&lt;[TableRow](#table-row)&gt; | Rows to be rendered inside the table header
 tableBodyRows | Getter | () => Array&lt;[TableRow](#table-row)&gt; | Rows to be rendered inside the table body
 tableColumns | Getter | () => Array&lt;[TableColumn](#table-column)&gt; | Columns to be rendered inside the table
-tableExtraProps | Getter | () => { [key: string]: any } | Additional table properties that can be provided by other plugins
-tableView | Template | | A template that renders a table
+tableExtraProps | Getter | () => { [key: string]: any } | Additional table properties that other plugins can provide 
 tableViewCell | Template | { row: [TableRow](#table-row), column: [TableColumn](#table-column) } | A template that renders a table cell
diff --git a/packages/dx-react-grid/src/plugins/table-filter-row.jsx b/packages/dx-react-grid/src/plugins/table-filter-row.jsx
index acfb711dee..e5f3336262 100644
--- a/packages/dx-react-grid/src/plugins/table-filter-row.jsx
+++ b/packages/dx-react-grid/src/plugins/table-filter-row.jsx
@@ -20,7 +20,7 @@ export class TableFilterRow extends React.PureComponent {
 
         <Template
           name="tableViewCell"
-          predicate={({ row }) => row.type === 'filter'}
+          predicate={({ row, column }) => row.type === 'filter' && !column.type}
           connectGetters={(getter, { column }) => ({
             filter: getColumnFilterConfig(getter('filters'), column.name),
           })}
diff --git a/packages/dx-react-grid/src/plugins/table-group-row.jsx b/packages/dx-react-grid/src/plugins/table-group-row.jsx
index e371853d47..6b42a9050f 100644
--- a/packages/dx-react-grid/src/plugins/table-group-row.jsx
+++ b/packages/dx-react-grid/src/plugins/table-group-row.jsx
@@ -37,18 +37,20 @@ export class TableGroupRow extends React.PureComponent {
             toggleGroupExpanded: () => toggleGroupExpanded({ groupKey: params.row.key }),
           })}
         </Template>
-        <Template
-          name="tableViewCell"
-          predicate={({ column, row }) => (
-            column.type === 'groupColumn'
-            && (
-              !row.type
-              || (row.type === 'groupRow' && row.column.name !== column.group.columnName)
-            )
-          )}
-        >
-          {groupIndentCellTemplate}
-        </Template>
+        {groupIndentCellTemplate && (
+          <Template
+            name="tableViewCell"
+            predicate={({ column, row }) => (
+              column.type === 'groupColumn'
+              && (
+                !row.type
+                || (row.type === 'groupRow' && row.column.name !== column.group.columnName)
+              )
+            )}
+          >
+            {groupIndentCellTemplate}
+          </Template>
+        )}
       </PluginContainer>
     );
   }
@@ -56,6 +58,10 @@ export class TableGroupRow extends React.PureComponent {
 
 TableGroupRow.propTypes = {
   groupCellTemplate: PropTypes.func.isRequired,
-  groupIndentCellTemplate: PropTypes.func.isRequired,
+  groupIndentCellTemplate: PropTypes.func,
   groupIndentColumnWidth: PropTypes.number.isRequired,
 };
+
+TableGroupRow.defaultProps = {
+  groupIndentCellTemplate: null,
+};
diff --git a/packages/dx-react-grid/src/plugins/table-group-row.test.jsx b/packages/dx-react-grid/src/plugins/table-group-row.test.jsx
new file mode 100644
index 0000000000..0d8bc6adbf
--- /dev/null
+++ b/packages/dx-react-grid/src/plugins/table-group-row.test.jsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import { setupConsole } from '@devexpress/dx-testing';
+import {
+  Template, TemplatePlaceholder, PluginHost,
+} from '@devexpress/dx-react-core';
+
+import { TableGroupRow } from './table-group-row';
+
+describe('TableGroupRow', () => {
+  let resetConsole;
+  beforeAll(() => {
+    resetConsole = setupConsole({ ignore: ['validateDOMNesting'] });
+  });
+
+  afterAll(() => {
+    resetConsole();
+  });
+
+  const testIndentCell = ({
+    cellParams,
+    shouldRender,
+    template = () => <td className="group-indent" />,
+  }) => {
+    const tree = mount(
+      <PluginHost>
+        <Template name="root">
+          <TemplatePlaceholder
+            name="tableViewCell"
+            params={cellParams}
+          />
+        </Template>
+        <TableGroupRow
+          groupCellTemplate={() => null}
+          groupIndentColumnWidth={40}
+          groupIndentCellTemplate={template}
+        />
+      </PluginHost>,
+    );
+
+    expect(tree.find('td.group-indent').exists())
+      .toBe(shouldRender);
+  };
+
+  it('should render indent cell in a group column intersection with a foreign group row', () => {
+    testIndentCell({
+      cellParams: {
+        column: { type: 'groupColumn', group: { columnName: 'a' } },
+        row: { type: 'groupRow', column: { name: 'b' } },
+      },
+      shouldRender: true,
+    });
+  });
+
+  it('should render indent cell in a group column intersection with a data row', () => {
+    testIndentCell({
+      cellParams: {
+        column: { type: 'groupColumn', group: { columnName: 'a' } },
+        row: { id: 1 },
+      },
+      shouldRender: true,
+    });
+  });
+
+  it('should not render indent cell if it is undefined', () => {
+    testIndentCell({
+      cellParams: {
+        column: { type: 'groupColumn', group: { columnName: 'a' } },
+        row: { id: 1 },
+      },
+      template: null,
+      shouldRender: false,
+    });
+  });
+});
diff --git a/packages/dx-react-grid/src/plugins/table-header-row.jsx b/packages/dx-react-grid/src/plugins/table-header-row.jsx
index 941798e6bb..66823569ef 100644
--- a/packages/dx-react-grid/src/plugins/table-header-row.jsx
+++ b/packages/dx-react-grid/src/plugins/table-header-row.jsx
@@ -18,17 +18,15 @@ export class TableHeaderRow extends React.PureComponent {
         />
         <Template
           name="tableViewCell"
-          predicate={({ row }) => row.type === 'heading'}
+          predicate={({ row, column }) => row.type === 'heading' && !column.type}
           connectGetters={(getter, { column }) => {
             const sorting = getter('sorting');
             const columns = getter('columns');
             const grouping = getter('grouping');
 
             const result = {
-              sortingSupported: !column.type &&
-                sorting !== undefined,
-              groupingSupported: !column.type &&
-                grouping !== undefined &&
+              sortingSupported: sorting !== undefined,
+              groupingSupported: grouping !== undefined &&
                 grouping.length < columns.length - 1,
             };
 
diff --git a/packages/dx-react-grid/src/plugins/table-view.jsx b/packages/dx-react-grid/src/plugins/table-view.jsx
index cb18679f53..fe203e9eb7 100644
--- a/packages/dx-react-grid/src/plugins/table-view.jsx
+++ b/packages/dx-react-grid/src/plugins/table-view.jsx
@@ -11,6 +11,8 @@ export class TableView extends React.PureComponent {
       tableTemplate,
       tableCellTemplate,
       tableNoDataCellTemplate,
+      tableStubCellTemplate,
+      tableStubHeaderCellTemplate,
       allowColumnReordering,
     } = this.props;
 
@@ -33,11 +35,8 @@ export class TableView extends React.PureComponent {
         />
         <Getter name="tableExtraProps" value={{}} />
 
-        <Template name="body">
-          <TemplatePlaceholder name="tableView" />
-        </Template>
         <Template
-          name="tableView"
+          name="body"
           connectGetters={getter => ({
             headerRows: getter('tableHeaderRows'),
             bodyRows: getter('tableBodyRows'),
@@ -55,6 +54,19 @@ export class TableView extends React.PureComponent {
         </Template>
         <Template
           name="tableViewCell"
+          connectGetters={getter => ({
+            headerRows: getter('tableHeaderRows'),
+          })}
+        >
+          {({ row, column, headerRows, ...restParams }) => (
+            headerRows.indexOf(row) > -1
+              ? tableStubHeaderCellTemplate(restParams)
+              : tableStubCellTemplate(restParams)
+          )}
+        </Template>
+        <Template
+          name="tableViewCell"
+          predicate={({ row, column }) => !column.type && !row.type}
         >
           {tableCellTemplate}
         </Template>
@@ -73,6 +85,8 @@ TableView.propTypes = {
   tableTemplate: PropTypes.func.isRequired,
   tableCellTemplate: PropTypes.func.isRequired,
   tableNoDataCellTemplate: PropTypes.func.isRequired,
+  tableStubCellTemplate: PropTypes.func.isRequired,
+  tableStubHeaderCellTemplate: PropTypes.func.isRequired,
   allowColumnReordering: PropTypes.bool,
 };
 
diff --git a/packages/dx-react-grid/src/plugins/table-view.test.jsx b/packages/dx-react-grid/src/plugins/table-view.test.jsx
new file mode 100644
index 0000000000..c4788c3e92
--- /dev/null
+++ b/packages/dx-react-grid/src/plugins/table-view.test.jsx
@@ -0,0 +1,208 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import {
+  Getter, Template, TemplatePlaceholder, PluginHost,
+} from '@devexpress/dx-react-core';
+import {
+  getTableCellInfo,
+} from '@devexpress/dx-grid-core';
+
+import { TableView } from './table-view';
+
+describe('TableView', () => {
+  it('should render data cell on user-defined column and row intersection', () => {
+    const tree = mount(
+      <PluginHost>
+        <Getter
+          name="columns"
+          value={[{ name: 'a' }, { name: 'b' }]}
+        />
+        <Getter
+          name="rows"
+          value={[{ id: 1 }, { id: 2 }]}
+        />
+        <Template name="root">
+          <TemplatePlaceholder name="body" />
+        </Template>
+        <TableView
+          tableTemplate={({ bodyRows, columns, cellTemplate }) => (
+            <table>
+              <tbody>
+                {bodyRows.map(row => (
+                  <tr key={row.id}>
+                    {columns.map(column => React.cloneElement(
+                      cellTemplate({ row, column }),
+                      { key: column.name },
+                    ))}
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )}
+          tableCellTemplate={({ row, column }) => <td className="data">{row.id + column.name}</td>}
+          tableStubCellTemplate={() => null}
+          tableStubHeaderCellTemplate={() => null}
+          tableNoDataCellTemplate={() => null}
+        />
+      </PluginHost>,
+    );
+
+    const dataCells = tree.find('td.data');
+    expect(dataCells)
+      .toHaveLength(4);
+    expect(dataCells.map(dataCell => dataCell.text()))
+      .toEqual(['1a', '1b', '2a', '2b']);
+  });
+
+  it('should render empty cell on plugin-defined column and row intersection', () => {
+    const tree = mount(
+      <PluginHost>
+        <Getter
+          name="columns"
+          value={[{ name: 'a' }, { name: 'b' }]}
+        />
+        <Getter
+          name="rows"
+          value={[{ id: 1 }, { id: 2 }]}
+        />
+        <Template name="root">
+          <TemplatePlaceholder name="body" />
+        </Template>
+        <TableView
+          tableTemplate={({ bodyRows, columns, cellTemplate }) => (
+            <table>
+              <tbody>
+                {bodyRows.map(row => (
+                  <tr key={row.id || row.type}>
+                    {columns.map(column => React.cloneElement(
+                      cellTemplate({ row, column }),
+                      { key: column.name || column.type },
+                    ))}
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )}
+          tableCellTemplate={() => <td className="data" />}
+          tableStubCellTemplate={() => <td className="empty" />}
+          tableStubHeaderCellTemplate={() => null}
+          tableNoDataCellTemplate={() => null}
+        />
+        <Getter
+          name="tableColumns"
+          pureComputed={tableColumns => [{ type: 'columnPlugin' }, ...tableColumns]}
+          connectArgs={getter => [getter('tableColumns')]}
+        />
+        <Getter
+          name="tableBodyRows"
+          pureComputed={tableBodyRows => [{ type: 'rowPlugin' }, ...tableBodyRows]}
+          connectArgs={getter => [getter('tableBodyRows')]}
+        />
+      </PluginHost>,
+    );
+
+    expect(tree.find('td.empty'))
+      .toHaveLength(5);
+  });
+
+  it('should render empty header cell on plugin-defined column and row intersection', () => {
+    const tree = mount(
+      <PluginHost>
+        <Getter
+          name="columns"
+          value={[{ name: 'a' }, { name: 'b' }]}
+        />
+        <Getter
+          name="rows"
+          value={[{ id: 1 }, { id: 2 }]}
+        />
+        <Template name="root">
+          <TemplatePlaceholder name="body" />
+        </Template>
+        <TableView
+          tableTemplate={({ headerRows, bodyRows, columns, cellTemplate }) => (
+            <table>
+              <tbody>
+                {[...headerRows, ...bodyRows].map(row => (
+                  <tr key={row.id || row.type}>
+                    {columns.map(column => React.cloneElement(
+                      cellTemplate({ row, column }),
+                      { key: column.name || column.type },
+                    ))}
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )}
+          tableCellTemplate={() => <td className="data" />}
+          tableStubCellTemplate={() => <td className="empty" />}
+          tableStubHeaderCellTemplate={() => <td className="empty-header" />}
+          tableNoDataCellTemplate={() => null}
+        />
+        <Getter
+          name="tableColumns"
+          pureComputed={tableColumns => [{ type: 'columnPlugin' }, ...tableColumns]}
+          connectArgs={getter => [getter('tableColumns')]}
+        />
+        <Getter
+          name="tableHeaderRows"
+          pureComputed={tableHeaderRows => [{ type: 'rowPlugin' }, ...tableHeaderRows]}
+          connectArgs={getter => [getter('tableHeaderRows')]}
+        />
+      </PluginHost>,
+    );
+
+    expect(tree.find('td.empty-header'))
+      .toHaveLength(3);
+  });
+
+  it('should render no data cell if rows are empty', () => {
+    const tree = mount(
+      <PluginHost>
+        <Getter
+          name="columns"
+          value={[{ name: 'a' }, { name: 'b' }]}
+        />
+        <Getter
+          name="rows"
+          value={[]}
+        />
+        <Template name="root">
+          <TemplatePlaceholder name="body" />
+        </Template>
+        <TableView
+          tableTemplate={({ bodyRows, columns, cellTemplate }) => (
+            <table>
+              <tbody>
+                {bodyRows.map(row => (
+                  <tr key={row.id || row.type}>
+                    {columns.map((column, columnIndex) => {
+                      const info = getTableCellInfo({ row, column, columnIndex, columns });
+                      if (info.skip) return null;
+
+                      return React.cloneElement(
+                        cellTemplate({ row, column, colspan: info.colspan }),
+                        { key: column.name || column.type },
+                      );
+                    })}
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )}
+          tableCellTemplate={() => null}
+          tableStubCellTemplate={() => null}
+          tableStubHeaderCellTemplate={() => null}
+          tableNoDataCellTemplate={({ colspan }) => <td className="no-data" colSpan={colspan} />}
+        />
+      </PluginHost>,
+    );
+
+    const noDataCell = tree.find('td.no-data');
+    expect(noDataCell)
+      .toHaveLength(1);
+    expect(noDataCell.prop('colSpan'))
+      .toBe(2);
+  });
+});