diff --git a/flow_screen_components/datatable/README.md b/flow_screen_components/datatable/README.md
index c3c98d65d..88d20cabf 100644
--- a/flow_screen_components/datatable/README.md
+++ b/flow_screen_components/datatable/README.md
@@ -51,8 +51,8 @@ https://unofficialsf.com/flow-action-and-screen-component-basepacks/
   
 ---
 **Install Datatable**  
-[Version 4.1.6 (Production or Developer)](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t5G000004XZk9QAG)   
-[Version 4.1.6 (Sandbox)](https://test.salesforce.com/packaging/installPackage.apexp?p0=04t5G000004XZk9QAG)
+[Version 4.2.0 (Production or Developer)](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t5G000004XZlHQAW)   
+[Version 4.2.0 (Sandbox)](https://test.salesforce.com/packaging/installPackage.apexp?p0=04t5G000004XZlHQAW)
  
 ---
 **Starting with the Winter '21 Release, Salesforce requires that a User's Profile or Permission Set is given specific permission to access any @AuraEnabled Apex Method.**  
@@ -72,7 +72,25 @@ A Permission Set (**USF Flow Screen Component - Datatable**) is included with th
 ---
 # Release Notes 
 
-## 02/06/24 -  Eric Smith -    Version 4.1.6 
+## 04/06/24 -  Eric Smith -     Version 4.2.0  
+**Updates:** 
+-   Added optional pagination  
+-       Adds a selectable number of Records per Page input to the header - default value 10  
+-       Adds a navigation footer with a editable input showing the current page # and total number of pages  
+-       The footer also includes Prev & Next buttons as well as optional First & Last Buttons  
+-       The appropriate buttons are disabled if the user is on the first or the last page  
+-       New pagination input prompts and button labels are translatable Custom Labels
+-       (Initial release does not support retaining selected records when sorting, filtering, searching, paginating) 
+-   Made the Table Header Label reactive  
+-   Moved the Configure Columns button from the top to the bottom of the Table Formatting section of the CPE  
+  
+**Bug Fixes:**  
+-   Fixed bug where the maximum number of rows to be displayed gets cleared  
+-   Fixed bug where an invalid link would show when an Apex Defined Lookup field was empty (@spyros-michailidisspyros-michailidis PR#1524)
+-   Fixed install issue with ers_DatatableController.cls if the target org has a class named "Test" 
+-   Fixed a bug where Date fields from External Objects would show as blank (@philipnovak-pentair PR#1529) 
+  
+## 02/06/24 -  Eric Smith -     Version 4.1.6 
 **Bug Fixes:**  
 -   Fixed several Spring '24 "Cannot read properties of undefined..." errors
 -   Allow a full row search when empty cells are present (thanks to clev32 PR#1478)
diff --git a/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls b/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls
index 074570e4b..e3ffe408b 100644
--- a/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls
+++ b/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls
@@ -47,6 +47,7 @@
  *                  3/14/22	    Version 3.5.0   Added option to suppress the currency conversion introduced in v3.1.1
  *                  9/6/22	    Version 4.0.9   Return a collection of datetime fields for handling in the LWC
  *                  11/12/23    Version 4.1.5   Identify all datetime fields even if they are not in the Datatable (Needed to support reactive Collection Processors)
+ *                  02/28/24    Version 4.2.0   Fix install issue if the target org has a class named "Test"
  */
 @SuppressWarnings('PMD.ClassNamingConventions')
 
@@ -389,7 +390,7 @@ public with sharing class ers_DatatableController {
             for (String currField : currencyFields) {
                 currencyFieldsQuery +=
                     ', ' +
-                    (Test.isRunningTest() ? currField : 'convertCurrency(' + currField + ')');
+                    (System.Test.isRunningTest() ? currField : 'convertCurrency(' + currField + ')');
             }
             currencyFieldsQuery += ' FROM ' + objName + ' WHERE Id IN :records';
             Map<Id, SObject> sobjCurrencyFields = new Map<Id, SObject>(
diff --git a/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls-meta.xml b/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls-meta.xml
index 754ecb155..f5e18fd16 100644
--- a/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableController.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableControllerTest.cls-meta.xml b/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableControllerTest.cls-meta.xml
index 754ecb155..f5e18fd16 100644
--- a/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableControllerTest.cls-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/classes/ers_DatatableControllerTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURL.cls-meta.xml b/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURL.cls-meta.xml
index 754ecb155..f5e18fd16 100644
--- a/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURL.cls-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURL.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURLTest.cls-meta.xml b/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURLTest.cls-meta.xml
index 754ecb155..f5e18fd16 100644
--- a/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURLTest.cls-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/classes/ers_EncodeDecodeURLTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecords.cls-meta.xml b/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecords.cls-meta.xml
index 754ecb155..f5e18fd16 100644
--- a/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecords.cls-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecords.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecordsTest.cls-meta.xml b/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecordsTest.cls-meta.xml
index 754ecb155..f5e18fd16 100644
--- a/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecordsTest.cls-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/classes/ers_QueryNRecordsTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/flow_screen_components/datatable/force-app/main/default/labels/CustomLabels.labels-meta.xml b/flow_screen_components/datatable/force-app/main/default/labels/CustomLabels.labels-meta.xml
index cfd46dd6c..ec44d73d2 100644
--- a/flow_screen_components/datatable/force-app/main/default/labels/CustomLabels.labels-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/labels/CustomLabels.labels-meta.xml
@@ -32,6 +32,70 @@
         <shortDescription>Clear All Filters</shortDescription>
         <value>Clear All Filters</value>
     </labels>
+    <labels>
+        <fullName>ers_FirstButton</fullName>
+        <categories>buttons</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>First Page</shortDescription>
+        <value>First</value>
+    </labels>
+    <labels>
+        <fullName>ers_PreviousButton</fullName>
+        <categories>buttons</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Previous Page</shortDescription>
+        <value>Prev</value>
+    </labels>
+    <labels>
+        <fullName>ers_NextButton</fullName>
+        <categories>buttons</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Next Page</shortDescription>
+        <value>Next</value>
+    </labels>
+    <labels>
+        <fullName>ers_LastButton</fullName>
+        <categories>buttons</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Last Page</shortDescription>
+        <value>Last</value>
+    </labels>
+    <labels>
+        <fullName>ers_RecordsPerPage</fullName>
+        <categories>labels</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Records per Page input label</shortDescription>
+        <value>Records per Page</value>
+    </labels>
+    <labels>
+        <fullName>ers_ShowingPagePrefix</fullName>
+        <categories>labels</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Showing Page x of y Pages input label prefix</shortDescription>
+        <value>Showing Page</value>
+    </labels>
+    <labels>
+        <fullName>ers_ShowingPageMiddle</fullName>
+        <categories>labels</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Showing Page x of y Pages input label middle</shortDescription>
+        <value>of</value>
+    </labels>
+    <labels>
+        <fullName>ers_ShowingPageSuffix</fullName>
+        <categories>labels</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Showing Page x of y Pages input label suffix</shortDescription>
+        <value>Pages</value>
+    </labels>
     <labels>
         <fullName>ers_SetFilterAction</fullName>
         <categories>actions</categories>
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.html b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.html
index 5792bfed1..926293ae2 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.html
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.html
@@ -109,8 +109,8 @@ <h3 class="slds-text-heading_medium">Interact with this sample datatable to conf
 
         <!-- DATATABLE -->
         <div class={formElementClass}>
-            <!-- New Format with Searchbar -->
-            <template if:true={isShowSearchBar}>
+            <!-- New Format with Searchbar and/or Pagination -->
+            <template lwc:if={isShowNewheader}>
                 <abbr class="slds-required" title="required">{requiredSymbol}</abbr>
                 <lightning-card variant="Narrow" icon-name={tableIcon}>
                     <div slot="title">
@@ -119,13 +119,30 @@ <h3 class="slds-text-heading_medium">Interact with this sample datatable to conf
                         </div>
                     </div>
                     <div slot="actions">
-                        <lightning-input 
-                            type="search"
-                            placeholder={searchPlaceholder}
-                            value={searchTerm}
-                            onchange={handleSearchChange}
-                            is-loading={isWorking}
-                        ></lightning-input>
+                        <div class="slds-grid slds-grid_align-end">
+                            <template lwc:if={isPagination}>
+                                <legend class="slds-form-element__legend slds-form-element__label">{recordCountLabel}</legend>
+                                <lightning-input
+                                    type="number"
+                                    min="1"
+                                    value={recordCountPerPage}
+                                    variant="label-hidden"
+                                    onchange={handleRecordCountChange}
+                                ></lightning-input>
+                            </template>
+                            <template lwc:if={isShowSearchBar}>
+                                <div class="slds-p-left_medium">
+                                    <lightning-input 
+                                        type="search"
+                                        placeholder={searchPlaceholder}
+                                        value={searchTerm}
+                                        variant="label-hidden"
+                                        onchange={handleSearchChange}
+                                        is-loading={isWorking}
+                                    ></lightning-input>
+                                </div>
+                            </template>
+                        </div>
                     </div>
                     <template if:true={isShowTable}>
                         <div if:true={isWorking}>
@@ -138,7 +155,7 @@ <h3 class="slds-text-heading_medium">Interact with this sample datatable to conf
         
                             <c-ers_custom-lightning-datatable
                                 aria-label={tableLabel}
-                                data={mydata}
+                                data={paginatedData}
                                 columns={columns}
                                 key-field={keyField}
                                 sorted-by={sortedBy}
@@ -193,7 +210,7 @@ <h3 class="slds-text-heading_medium">Interact with this sample datatable to conf
             </template>
 
             <!-- Old Format with Searchbar commented out -->
-            <template if:false={isShowSearchBar}>
+            <template if:false={isShowNewheader}>
                 <template if:true={isDisplayHeader}>
                     <div class="slds-grid slds-grid_align-spread">
                         <div class="slds-col">
@@ -236,7 +253,7 @@ <h3 class="slds-text-heading_medium">Interact with this sample datatable to conf
                     <div if:false={isWorking} style={tableHeightAttribute} class={borderClass} id="datatable">
                         <c-ers_custom-lightning-datatable
                             aria-label={tableLabel}
-                            data={mydata}
+                            data={paginatedData}
                             columns={columns}
                             key-field={keyField}
                             sorted-by={sortedBy}
@@ -286,6 +303,68 @@ <h3 class="slds-text-heading_medium">Interact with this sample datatable to conf
             </template>
         </div>
 
+        <!-- Pagination Footer -->
+        <template lwc:if={isPagination}>
+            <div class="slds-grid slds-grid_align-center">
+                <template lwc:if={isShowButtonFirstLast}>
+                    <div class="slds-col slds-align-middle slds-p-top_medium slds-p-right_xx-small">
+                        <lightning-button
+                            label={buttonFirstLabel}
+                            variant="brand-outline"
+                            icon-position="left"
+                            icon-name="utility:arrow_left"
+                            onclick={handleButtonFirst}
+                            disabled={isFirstPage}
+                        ></lightning-button>
+                    </div>
+                </template>
+                <div class="slds-col slds-align-middle slds-p-top_medium">
+                    <lightning-button
+                        label={buttonPrevLabel}
+                        variant="brand-outline"
+                        icon-position="left"
+                        icon-name="utility:chevronleft"
+                        onclick={handleButtonPrev}
+                        disabled={isFirstPage}
+                    ></lightning-button>
+                </div>
+                <div class="slds-col slds-text-body_regular slds-p-horizontal_medium slds-align-middle">
+                    <lightning-input
+                        type="number"
+                        min="1"
+                        max={pageTotalCount}
+                        label={pageNumberLabel}
+                        value={pageCurrentNumber}
+                        variant="label-stacked"
+                        onchange={handlePageChange}
+                        disabled={isOnlyOnePage}
+                    ></lightning-input>
+                </div>
+                <div class="slds-col slds-align-middle slds-p-top_medium">
+                    <lightning-button
+                        label={buttonNextLabel}
+                        variant="brand-outline"
+                        icon-position="right"
+                        icon-name="utility:chevronright"
+                        onclick={handleButtonNext}
+                        disabled={isLastpage}
+                    ></lightning-button>
+                </div>
+                <template lwc:if={isShowButtonFirstLast}>
+                    <div class="slds-col slds-align-middle slds-p-top_medium slds-p-left_xx-small">
+                        <lightning-button
+                            label={buttonLastLabel}
+                            variant="brand-outline"
+                            icon-position="right"
+                            icon-name="utility:arrow_right"
+                            onclick={handleButtonLast}
+                            disabled={isLastpage}
+                        ></lightning-button>
+                    </div>
+                </template>
+            </div>
+        </template>
+
         <!-- Special Footer parameter display for Configuration Mode -->
         <template if:true={isConfigMode}>
             
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js
index 0ae97f9f3..1ff11a85c 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js
@@ -27,8 +27,16 @@ import LabelHeader from '@salesforce/label/c.ers_LabelHeader';
 import RequiredMessage from '@salesforce/label/c.ers_ErrorRequiredEntry';
 import EmptyMessage from '@salesforce/label/c.ers_EmptyTableMessage';
 import SearchPlaceholder from '@salesforce/label/c.ers_SearchPlaceholder';
+import FirstButton from '@salesforce/label/c.ers_FirstButton';
+import PreviousButton from '@salesforce/label/c.ers_PreviousButton';
+import NextButton from '@salesforce/label/c.ers_NextButton';
+import LastButton from '@salesforce/label/c.ers_LastButton';
+import RecordsPerPage from '@salesforce/label/c.ers_RecordsPerPage';
+import ShowingPagePrefix from '@salesforce/label/c.ers_ShowingPagePrefix';
+import ShowingPageMiddle from '@salesforce/label/c.ers_ShowingPageMiddle';
+import ShowingPageSuffix from '@salesforce/label/c.ers_ShowingPageSuffix';
 
-const CONSTANTS = getConstants();   // From ers_datatableUtils : VERSION_NUMBER, MAXROWCOUNT, ROUNDWIDTH, MYDOMAIN, ISCOMMUNITY, ISFLOWBUILDER, MIN_SEARCH_TERM_SIZE, SEARCH_WAIT_TIME
+const CONSTANTS = getConstants();   // From ers_datatableUtils : VERSION_NUMBER, MAXROWCOUNT, ROUNDWIDTH, MYDOMAIN, ISCOMMUNITY, ISFLOWBUILDER, MIN_SEARCH_TERM_SIZE, SEARCH_WAIT_TIME, RECORDS_PER_PAGE
 
 const MYDOMAIN = CONSTANTS.MYDOMAIN;
 const ISCOMMUNITY = CONSTANTS.ISCOMMUNITY;
@@ -36,6 +44,7 @@ const ISFLOWBUILDER = CONSTANTS.ISFLOWBUILDER;
 const CB_TRUE = CONSTANTS.CB_TRUE;
 const MIN_SEARCH_TERM_SIZE = CONSTANTS.MIN_SEARCH_TERM_SIZE;
 const SEARCH_WAIT_TIME = CONSTANTS.SEARCH_WAIT_TIME;
+const RECORDS_PER_PAGE = CONSTANTS.RECORDS_PER_PAGE;
 
 export default class Datatable extends LightningElement {
 
@@ -52,7 +61,15 @@ export default class Datatable extends LightningElement {
         LabelHeader,
         RequiredMessage,
         EmptyMessage,
-        SearchPlaceholder
+        SearchPlaceholder,
+        FirstButton,
+        PreviousButton,
+        NextButton,
+        LastButton,
+        RecordsPerPage,
+        ShowingPagePrefix,
+        ShowingPageMiddle,
+        ShowingPageSuffix
     };
 
     // Component Input & Output Attributes
@@ -81,7 +98,18 @@ export default class Datatable extends LightningElement {
     @api outputSelectedRow;
     @api outputEditedRows = [];
     @api tableIcon;
-    @api tableLabel;
+    
+    // v4.2.0 Make Table Header Label reactive
+    // @api tableLabel;
+    @api 
+    get tableLabel() {
+        return this._tableLabel || '';
+    }
+    set tableLabel(value) {
+        this._tableLabel = value;
+    }
+    _tableLabel;
+
     @api recordTypeId;
 
     _tableData;
@@ -135,6 +163,20 @@ export default class Datatable extends LightningElement {
     }
     @api cb_showRowNumbers;
     
+    @api 
+    get showPagination() {
+        return (this.cb_showPagination == CB_TRUE) ? true : false;
+    }
+    @api cb_showPagination;
+
+    @api recordsPerPage = RECORDS_PER_PAGE;
+
+    @api 
+    get showFirstLastButtons() {
+        return (this.cb_showFirstLastButtons == CB_TRUE) ? true : false;
+    }
+    @api cb_showFirstLastButtons = CB_TRUE;
+
     @api 
     get showRecordCount() {
         return (this.cb_showRecordCount == CB_TRUE) ? true : false;
@@ -342,7 +384,7 @@ export default class Datatable extends LightningElement {
     @api errors;
     @api columnWidthValues;
     @track columns = [];
-    @track mydata = [];
+    // @track mydata = [];
     @track selectedRows = [];
     @track roundValueLabel;
     @track columnWidthsLabel;
@@ -437,6 +479,158 @@ export default class Datatable extends LightningElement {
     @track columnFlexParameter;
     @track columnEditParameter;
     @track columnFilterParameter;
+    
+    get collectionSize() {
+        let max = Math.min(CONSTANTS.MAXROWCOUNT, this.maxNumberOfRows);
+        return Math.min(this._tableData.length, max);
+    }
+
+    @api
+    get mydata() {
+        return this._mydata;
+    }
+    set mydata(value) {
+        this._mydata = value;
+        this.handlePagination();
+    }
+    _mydata = [];
+
+    // Pagination Attributes
+
+    @api
+    get recordCountPerPage() {
+        return this._recordCountPerPage;
+    }
+    set recordCountPerPage(value) {
+        this._recordCountPerPage = value;
+    }
+    _recordCountPerPage;
+
+    get recordCountTotal() {
+        return this.collectionSize;
+    }
+
+    @api
+    get pageCurrentNumber() {
+        return this._pageCurrentNumber;
+    }
+    set pageCurrentNumber(value) {
+        this._pageCurrentNumber = value;
+        this.handlePagination();
+    }
+    _pageCurrentNumber = 1;
+
+    get recordCountLabel() {
+        return this.label.RecordsPerPage;
+    }
+
+    get pageNumberLabel() {
+        return `${this.label.ShowingPagePrefix} ${this._pageCurrentNumber} ${this.label.ShowingPageMiddle} ${this.pageTotalCount} ${this.label.ShowingPageSuffix}`;
+    }
+
+    get buttonFirstLabel() {
+        return this.label.FirstButton;
+    }
+
+    get buttonLastLabel() {
+        return this.label.LastButton;
+    }
+    
+    get buttonPrevLabel() {
+        return this.label.PreviousButton;
+    }
+    
+    get buttonNextLabel() {
+        return this.label.NextButton;
+    }
+    
+    get pageTotalCount() {
+        return Math.ceil(Number(Math.min(this.recordCountTotal,this.filteredRecordCount))/Number(this._recordCountPerPage));
+    }
+
+    get isFirstPage() {
+        return (this.pageCurrentNumber === 1);
+    }
+
+    get isLastpage() {
+        return (this.pageCurrentNumber === this.pageTotalCount);
+    }
+
+    get isOnlyOnePage() {
+        return (this.pageTotalCount === 1);
+    }
+
+    get isShowButtonFirstLast() {
+        return this.showFirstLastButtons;
+    }
+
+    get isPagination() {
+        return this.showPagination;
+    }
+
+    get isShowNewheader() {
+        return (this.isShowSearchBar || this.showPagination);
+    }
+
+    get pageFooterAlignment() {
+        return 'Left';
+    }
+
+    @api
+    get paginatedData() {
+        return this._paginatedData;
+    }
+    set paginatedData(value = this._mydata) {
+        this._paginatedData = value;
+    }
+    _paginatedData;
+
+    @api paginatedSelectedRows = [];    //TODO: Figure out how to retain selected rows when paginating, sorting, filtering, searching
+    // End pagination Attributes
+
+    // Pagination Methods
+    initiatePagination() {
+        if (this.isPagination) {
+            this.recordCountPerPage = Math.max(this.recordsPerPage,1);
+        }
+    }
+
+    handleRecordCountChange(event) {
+        this.recordCountPerPage = event.detail.value;
+        this.pageCurrentNumber = 1; //TODO: Change to set to whatever the page would be to still display whatever the first record was previously
+        this.handlePagination();
+    }
+
+    handlePageChange(event) {
+        this.pageCurrentNumber = event.detail.value;
+    }
+
+    handleButtonFirst() {
+        this.pageCurrentNumber = 1;
+    }
+
+    handleButtonPrev() {
+        this.pageCurrentNumber--;
+    }
+    
+    handleButtonNext() {
+        this.pageCurrentNumber++;
+    }
+    
+    handleButtonLast() {
+        this.pageCurrentNumber = this.pageTotalCount;
+    }
+    
+    handlePagination() {
+        if (this.isPagination) {
+            let firstRecord = (this._pageCurrentNumber - 1) * this._recordCountPerPage;
+            let lastRecord = Math.min( (this._pageCurrentNumber * this._recordCountPerPage), this.recordCountTotal );
+            this.paginatedData = this._mydata.slice(firstRecord,lastRecord);
+        } else {
+            this.paginatedData = [...this._mydata];
+        }
+    }
+    // End Pagination Methods
 
     get formElementClass() {
         return this.isInvalid ? 'slds-form-element slds-has-error' : 'slds-form-element';
@@ -452,7 +646,7 @@ export default class Datatable extends LightningElement {
 
     get formattedTableLabel() {
         let filteredCount = (this.filteredRecordCount != this.tableRecordCount) ? `${this.filteredRecordCount} of ` : '';
-        return (this.showRecordCount) ? `${this.tableLabel} (${filteredCount}${this.tableRecordCount})` : this.tableLabel;
+        return (this.showRecordCount) ? `${this._tableLabel} (${filteredCount}${this.tableRecordCount})` : this._tableLabel;
     }
 
     get tableRecordCount() {
@@ -460,11 +654,11 @@ export default class Datatable extends LightningElement {
     }
 
     get filteredRecordCount() {
-        return this.mydata.length;
+        return this._mydata.length;
     }
 
     get isShowTable() {
-        return this.mydata.length > 0 || this.isFiltered;
+        return this._mydata.length > 0 || this.isFiltered;
         // return this._tableData.length > 0;
     }
 
@@ -539,7 +733,7 @@ export default class Datatable extends LightningElement {
         const logStyleNumber = 'color: red; font-size: 16px';
         console.log("%cdatatable VERSION_NUMBER: %c"+CONSTANTS.VERSION_NUMBER, logStyleText, logStyleNumber);
         console.log('MYDOMAIN', MYDOMAIN);
-
+        
         // Picklist field processing
         if (!this.recordTypeId) this.recordTypeId = this.masterRecordTypeId;
         
@@ -582,16 +776,19 @@ export default class Datatable extends LightningElement {
             this.maxNumberOfRows = CONSTANTS.MAXROWCOUNT;
         }
 
+        // Pagination Initiation
+        this.initiatePagination();
+
         console.log('this._tableData',this._tableData);
         if(!this._tableData) {
             this.isUpdateTable = false;
             this._tableData = [];
         }
 
-        let max = Math.min(CONSTANTS.MAXROWCOUNT, this.maxNumberOfRows);
-        let cnt = Math.min(this._tableData.length, max);
+        // let max = Math.min(CONSTANTS.MAXROWCOUNT, this.maxNumberOfRows);
+        // let cnt = Math.min(this._tableData.length, max);
         this.isUpdateTable = false;
-        this._tableData = [...this._tableData].slice(0,cnt);
+        this._tableData = [...this._tableData].slice(0,this.collectionSize);
 
         // Set roundValue for setting Column Widths in Config Mode
         this.roundValueLabel = `Snap each Column Width to the Nearest ${CONSTANTS.ROUNDWIDTH} pixel Boundary`;
@@ -1000,7 +1197,7 @@ export default class Datatable extends LightningElement {
     updateDataRows() {
         // Process Incoming Data Collection
         console.log('Processing updateDataRows')
-        let data = (this.recordData) ? JSON.parse(JSON.stringify([...this.recordData])) : [];
+        let data = (this.recordData) ? JSON.parse(JSON.stringify([...this.recordData].slice(0,this.collectionSize))) : [];
         let lookupFields = this.lookups;
         let lufield = '';
         let timeFields = this.timeFieldArray;
@@ -1029,8 +1226,8 @@ export default class Datatable extends LightningElement {
             // Adjust date with offset based on User's timezone
             dateFields.forEach(date => {
                 if (record[date]) {
-                    let dt = Date.parse(record[date] + "T12:00:00.000Z");   //Set to Noon to avoid DST issues with the offset (v4.0.4)
-                    if (!isNaN(dt)) {
+                    let dt = Date.parse(record[date] + "T12:00:00.000Z");   // Set to Noon to avoid DST issues with the offset (v4.0.4)
+                    if (!isNaN(dt)) {   // Dates from External Objects are already formatted as Datetime (PR#1529)
                         let d = new Date();
                         record[date] = new Date(d.setTime(Number(dt) - Number(this.timezoneOffset)));
                     }
@@ -1059,7 +1256,9 @@ export default class Datatable extends LightningElement {
             lookupFields.forEach(lookup => {
                 if (this.isUserDefinedObject) {
                     lufield = lookup;
-                    record[lufield + '_lookup'] = MYDOMAIN + record[lufield + '_lookup'];                    
+                    if(record[lufield]) {
+                        record[lufield + '_lookup'] = MYDOMAIN + record[lufield + '_lookup'];
+                    }                   
                 } else {
                     if(lookup.toLowerCase().endsWith('id')) {
                         lufield = lookup.replace(/Id$/gi,'');
@@ -1115,12 +1314,12 @@ export default class Datatable extends LightningElement {
 
         // Set table data attributes
         this.mydata = [...data];
-        this.savePreEditData = [...this.mydata];
+        this.savePreEditData = [...this._mydata];
         this.editedData = JSON.parse(JSON.stringify([...this._tableData]));  // Must clone because cached items are read-only
         console.log('selectedRows',this.selectedRows);
         console.log('keyField:',this.keyField);
         console.log('tableData',this._tableData);
-        console.log('mydata:',this.mydata);
+        console.log('mydata:',this._mydata);
     }
 
     updateColumns() {
@@ -1488,7 +1687,7 @@ export default class Datatable extends LightningElement {
         const action = event.detail.action;
         const row = JSON.parse(JSON.stringify(event.detail.row));
         const keyValue = row[this.keyField];
-        this.mydata = this.mydata.map(rowData => {
+        this.mydata = this._mydata.map(rowData => {
             if (rowData[this.keyField] === keyValue) {
                 switch (action.name) {
                     // case 'action': goes here
@@ -1543,7 +1742,7 @@ export default class Datatable extends LightningElement {
         let editField = '';
 
         // Apply drafts to mydata
-        let data = [...this.mydata];
+        let data = [...this._mydata];
         data = data.map(item => {
             const draft = draftValues.find(d => d[this.keyField] == item[this.keyField]);
             if (draft != undefined) {
@@ -1678,6 +1877,7 @@ export default class Datatable extends LightningElement {
     }
 
     handleRowSelection(event) {
+        // TODO - Pagination - Persist previously selected rows that are not displayed on the currently visible page
         // Only used with row selection
         // Update values to be passed back to the Flow
         let currentSelectedRows = event.detail.selectedRows;
@@ -1773,7 +1973,7 @@ export default class Datatable extends LightningElement {
         this.isWorking = true;
         new Promise((resolve, reject) => {
             setTimeout(() => {
-                this.mydata = [...this.mydata.sort(
+                this.mydata = [...this._mydata.sort(
                     (a,b)=>(a=fieldValue(a),b=fieldValue(b),reverse*((a>b)-(b>a)))
                 )];
                 resolve();
@@ -2232,7 +2432,7 @@ export default class Datatable extends LightningElement {
         })
         .then(
             () => {
-                this.filteredData = [...this.mydata];
+                this.filteredData = [...this._mydata];
                 if (this.searchTerm && this.searchTerm != null) {
                     this.searchRowData(this.searchTerm)
                 };
@@ -2478,7 +2678,7 @@ export default class Datatable extends LightningElement {
                 const basic = this.basicColumns.find(b => b.fieldName == fld);
                 if (basic?.type.includes("text")) {
                     if (erow[fld]?.length > basic.length) {
-                        let errorRow = this.mydata.findIndex(d => d[this.keyField] == erow[this.keyField]) + 1;
+                        let errorRow = this._mydata.findIndex(d => d[this.keyField] == erow[this.keyField]) + 1;
                         errorMessage += `The value for ${fld} in Row #${errorRow} is ${erow[fld]?.length} characters long.  The maximum allowed length is ${basic.length} characters.\n`;                        
                     }
                 }
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml
index b935cca9f..8f44e6da5 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml
@@ -2,7 +2,7 @@
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <masterLabel>Datatable</masterLabel>
     <description>This component allows the user to configure and display a datatable in a Flow screen.</description>
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <isExposed>true</isExposed>
     <targets>
         <target>lightning__FlowScreen</target>
@@ -105,6 +105,11 @@
             <property name="matchCaseOnFilters" label="Match Case on Column Filters?" type="Boolean" default="false" role="inputOnly" description="Set to True is you want to force an exact match on case for column filter values."/>
             <property name="cb_matchCaseOnFilters" type="String" role="inputOnly"/>
             <property name="maxNumberOfRows" label="Maximum Number of Records to Display" type="Integer" role="inputOnly" description="Enter a number here if you want to restrict how many rows will be displayed in the datatable."/>
+            <property name="showPagination" type="Boolean" role="inputOnly"/>
+            <property name="cb_showPagination" type="String" role="inputOnly"/>
+            <property name="recordsPerPage" type="Integer" role="inputOnly"/>
+            <property name="showFirstLastButtons" type="Boolean" role="inputOnly"/>
+            <property name="cb_showFirstLastButtons" type="String" role="inputOnly"/>
             <property name="isRequired" label="Required?" type="Boolean" default="false" role="inputOnly" description="Require at least 1 row to be selected?"/>
             <property name="cb_isRequired" type="String" role="inputOnly"/>
             <property name="singleRowSelection" label="Single Row Selection (Radio Buttons)?" type="Boolean" default="false" role="inputOnly" description="When set to True, Radio Buttons will be displayed and only a single row can be selected.  
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_comboboxColumnType/ers_comboboxColumnType.js-meta.xml b/flow_screen_components/datatable/force-app/main/default/lwc/ers_comboboxColumnType/ers_comboboxColumnType.js-meta.xml
index 239cdb0ea..160631af4 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_comboboxColumnType/ers_comboboxColumnType.js-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_comboboxColumnType/ers_comboboxColumnType.js-meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <description>Custom datatable column type for comobobox</description>
     <isExposed>false</isExposed>
     <masterLabel>Combobox Column Type</masterLabel>
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_customLightningDatatable/ers_customLightningDatatable.js-meta.xml b/flow_screen_components/datatable/force-app/main/default/lwc/ers_customLightningDatatable/ers_customLightningDatatable.js-meta.xml
index 7df2fff1e..b07f13fe0 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_customLightningDatatable/ers_customLightningDatatable.js-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_customLightningDatatable/ers_customLightningDatatable.js-meta.xml
@@ -2,6 +2,6 @@
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <masterLabel>custom-lighting-datatable</masterLabel>
     <description>This component extends lightning datatable to use custom data types</description>
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <isExposed>true</isExposed>
 </LightningComponentBundle>
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html
index 56ac39092..201ba0953 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html
@@ -115,71 +115,6 @@
         modal-header-color={defaultModalHeaderColor}
     ></c-fsc_flow-banner>
 
-    <!-- =============== Column Wizard =============== -->
-    <div class={inputValues.columnFields.class}>
-        <div class="slds-form-element__control">
-            <div if:true={isObjectSelected}> 
-            
-                <!-- Column Wizard -->
-                <div class="slds-m-top_small">
-                        <lightning-button label="Configure Columns" icon-name="utility:lightning_extension" onclick={showModal}></lightning-button>
-                </div>
-
-                <template if:true={openModal}>
-                    <div class="slds-modal slds-modal_large slds-fade-in-open slds-backdrop">
-                        <div class="slds-modal__container">
-
-                            <!-- Header Section -->
-                            <div class="slds-modal__header">
-                                <lightning-button-icon icon-name="utility:close"
-                                    alternative-text="Close this window" size="large" variant="bare-inverse"
-                                    onclick={closeModal} class="slds-modal__close">
-                                </lightning-button-icon>
-                                <div if:false={isFlowLoaded}>
-                                    <h1 class="slds-modal__title slds-hyphenate">Please Wait... Loading Field Details</h1>
-                                </div>
-                                <div if:true={isFlowLoaded}>
-                                    <h2 class="slds-modal__title slds-hyphenate">Configure Columns</h2>
-                                </div>
-                            </div>
-
-                            <!-- Body Section -->
-                            <div class="slds-modal__content slds-p-around_medium">
-                                <div if:false={isFlowLoaded}>
-                                    <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
-                                </div>
-                                <lightning-flow
-                                    flow-api-name="Datatable_Configuration_Wizard5"
-                                    onstatuschange={handleFlowStatusChange}
-                                    flow-input-variables={wizardParams}
-                                ></lightning-flow>
-                            </div>
-
-                            <!-- Footer Section -->
-                            <!-- <div class="slds-modal__footer slds-modal__footer_directional">
-                                <lightning-button label="Cancel" onclick={handleWizardCancel}></lightning-button>
-                                <lightning-button label="Restart" onclick={handleWizardRestart}></lightning-button>
-                                <lightning-button label={nextLabel} onclick={handleWizardNext} variant="brand" disabled={isNextDisabled}></lightning-button>
-                                <lightning-slider value={wizardHeight} label="Wizard Height (pixels)"
-                                    min="400" 
-                                    max="1000" 
-                                    step="10"
-                                    onchange={handleHeightChange}>
-                                </lightning-slider>
-                            </div> -->
-
-                        </div>
-                    </div>
-                </template>
-
-            </div>
-        </div>
-        <c-fsc_display-error 
-            is-error={inputValues.columnFields.isError}
-            error-message={inputValues.columnFields.errorMessage}
-        ></c-fsc_display-error>
-    </div>
-
     <!-- Table Header -->
     <div class="slds-box slds-box_x-small slds-m-top_small">
         <!-- Display Header Checkbox -->
@@ -220,7 +155,7 @@ <h2 class="slds-modal__title slds-hyphenate">Configure Columns</h2>
         </c-fsc_pick-icon>
     </div>
 
-    <!-- Other Table Formatting -->
+    <!-- Max Record Count -->  
     <c-fsc_flow-combobox 
         name="select_maxNumberOfRows" 
         label={inputValues.maxNumberOfRows.label}
@@ -234,16 +169,53 @@ <h2 class="slds-modal__title slds-hyphenate">Configure Columns</h2>
         automatic-output-variables={automaticOutputVariables}>
     </c-fsc_flow-combobox>
 
-    <div class="slds-m-top_xx-small">
-        <c-fsc_flow-checkbox
-            name="select_showRowNumbers"
-            label={inputValues.showRowNumbers.label} 
-            checked={inputValues.cb_showRowNumbers.value} 
-            field-level-help={inputValues.showRowNumbers.helpText}
-            oncheckboxchanged={handleCheckboxChange}
-        ></c-fsc_flow-checkbox>
+    <!-- Pagination -->
+    <div class={paginationClass}>
+        <div class={paginationCheckboxClass}>
+            <c-fsc_flow-checkbox
+                name="select_showPagination"
+                label={inputValues.showPagination.label} 
+                checked={inputValues.cb_showPagination.value} 
+                field-level-help={inputValues.showPagination.helpText}
+                oncheckboxchanged={handleCheckboxChange}
+            ></c-fsc_flow-checkbox>
+        </div>
+
+        <div class={showHidePaginationAttributes}>
+            <c-fsc_flow-combobox 
+                name="select_recordsPerPage" 
+                label={inputValues.recordsPerPage.label}
+                value={inputValues.recordsPerPage.value} 
+                value-type={inputValues.recordsPerPage.valueDataType}
+                field-level-help={inputValues.recordsPerPage.helpText}
+                builder-context-filter-type="Number"
+                builder-context-filter-collection-boolean={inputValues.recordsPerPage.isCollection}
+                builder-context={_builderContext} 
+                onvaluechanged={handleFlowComboboxValueChange}
+                automatic-output-variables={automaticOutputVariables}>
+            </c-fsc_flow-combobox>
+
+            <div class="slds-m-top_xx-small">
+                <c-fsc_flow-checkbox
+                    name="select_showFirstLastButtons"
+                    label={inputValues.showFirstLastButtons.label} 
+                    checked={inputValues.cb_showFirstLastButtons.value} 
+                    field-level-help={inputValues.showFirstLastButtons.helpText}
+                    oncheckboxchanged={handleCheckboxChange}
+                ></c-fsc_flow-checkbox>
+            </div>
+        </div>
     </div>
 
+    <!-- Other Table Formatting -->
+    <c-fsc_flow-checkbox
+        name="select_showRowNumbers"
+        label={inputValues.showRowNumbers.label} 
+        checked={inputValues.cb_showRowNumbers.value} 
+        field-level-help={inputValues.showRowNumbers.helpText}
+        oncheckboxchanged={handleCheckboxChange}
+    ></c-fsc_flow-checkbox>
+
     <c-fsc_flow-checkbox
         name="select_showRecordCount"
         label={inputValues.showRecordCount.label} 
@@ -269,6 +241,71 @@ <h2 class="slds-modal__title slds-hyphenate">Configure Columns</h2>
         oncheckboxchanged={handleCheckboxChange}
     ></c-fsc_flow-checkbox>
 
+    <!-- =============== Column Wizard =============== -->
+    <div class={inputValues.columnFields.class}>
+        <div class="slds-form-element__control">
+            <div if:true={isObjectSelected}> 
+            
+                <!-- Column Wizard -->
+                <div class="slds-m-top_small">
+                        <lightning-button label="Configure Columns" icon-name="utility:lightning_extension" onclick={showModal}></lightning-button>
+                </div>
+
+                <template if:true={openModal}>
+                    <div class="slds-modal slds-modal_large slds-fade-in-open slds-backdrop">
+                        <div class="slds-modal__container">
+
+                            <!-- Header Section -->
+                            <div class="slds-modal__header">
+                                <lightning-button-icon icon-name="utility:close"
+                                    alternative-text="Close this window" size="large" variant="bare-inverse"
+                                    onclick={closeModal} class="slds-modal__close">
+                                </lightning-button-icon>
+                                <div if:false={isFlowLoaded}>
+                                    <h1 class="slds-modal__title slds-hyphenate">Please Wait... Loading Field Details</h1>
+                                </div>
+                                <div if:true={isFlowLoaded}>
+                                    <h2 class="slds-modal__title slds-hyphenate">Configure Columns</h2>
+                                </div>
+                            </div>
+
+                            <!-- Body Section -->
+                            <div class="slds-modal__content slds-p-around_medium">
+                                <div if:false={isFlowLoaded}>
+                                    <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+                                </div>
+                                <lightning-flow
+                                    flow-api-name="Datatable_Configuration_Wizard5"
+                                    onstatuschange={handleFlowStatusChange}
+                                    flow-input-variables={wizardParams}
+                                ></lightning-flow>
+                            </div>
+
+                            <!-- Footer Section -->
+                            <!-- <div class="slds-modal__footer slds-modal__footer_directional">
+                                <lightning-button label="Cancel" onclick={handleWizardCancel}></lightning-button>
+                                <lightning-button label="Restart" onclick={handleWizardRestart}></lightning-button>
+                                <lightning-button label={nextLabel} onclick={handleWizardNext} variant="brand" disabled={isNextDisabled}></lightning-button>
+                                <lightning-slider value={wizardHeight} label="Wizard Height (pixels)"
+                                    min="400" 
+                                    max="1000" 
+                                    step="10"
+                                    onchange={handleHeightChange}>
+                                </lightning-slider>
+                            </div> -->
+
+                        </div>
+                    </div>
+                </template>
+
+            </div>
+        </div>
+        <c-fsc_display-error 
+            is-error={inputValues.columnFields.isError}
+            error-message={inputValues.columnFields.errorMessage}
+        ></c-fsc_display-error>
+    </div>
+
     <!-- =============== Table Behavior Banner =============== -->
     <c-fsc_flow-banner
         banner-label={sectionEntries.tableBehavior.label}
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js
index a6b295c46..7d39d8aa9 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js
@@ -21,6 +21,7 @@ const CONSTANTS = getConstants();   // From ers_datatableUtils : VERSION_NUMBER,
 const CB_TRUE = CONSTANTS.CB_TRUE;
 const CB_FALSE = CONSTANTS.CB_FALSE;
 const CB_PREFIX = CONSTANTS.CB_ATTRIB_PREFIX;
+const RECORDS_PER_PAGE = CONSTANTS.RECORDS_PER_PAGE;
 
 const defaults = {
     tableBorder: true,
@@ -212,6 +213,21 @@ export default class ers_datatableCPE extends LightningElement {
         return this.showColumnAttributes ? 'slds-show' : 'slds-hide';
     }
 
+    @api
+    get showHidePaginationAttributes() {
+        return (this.inputValues.cb_showPagination.value == CB_TRUE) ? 'slds-show' : 'slds-hide';
+    }
+
+    @api
+    get paginationClass() {
+        return (this.inputValues.cb_showPagination.value == CB_TRUE) ? 'slds-box slds-box_x-small slds-m-top_small' : '';
+    }
+
+    @api
+    get paginationCheckboxClass() {
+        return (this.inputValues.cb_showPagination.value == CB_TRUE) ? '' : 'slds-m-top_xx-small';
+    }
+
     @api
     get isNoLinks() {
         return (this.inputValues.cb_not_suppressNameFieldLink.value == CB_FALSE);
@@ -464,8 +480,16 @@ export default class ers_datatableCPE extends LightningElement {
         tableHeight: {value: null, valueDataType: null, isCollection: false, label: 'Table Height',
             helpText: 'CSS specification for the height of the datatable (Examples: 30rem, 200px, calc(50vh - 100px)  If you leave this blank, the datatable will expand to display all records.)  \n' +
             'NOTE: This value will be ignored if the Allow Overflow attribute is set to True.'},
-        maxNumberOfRows: {value: null, valueDataType: null, isCollection: false, label: 'Maximum Number of Records to Display', 
-            helpText: 'Enter a number here if you want to restrict how many rows will be displayed in the datatable.'},
+        maxNumberOfRows: {value: null, valueDataType: null, isCollection: false, label: 'Maximum Number of Records to Include', 
+            helpText: 'Enter a number here if you want to restrict how many records will be included from the record collection.'},
+        showPagination: {value: null, valueDataType: null, isCollection: false, label: 'Add Pagination', 
+            helpText: 'When selected, an entry will be added to the header to select the number of records per page and a footer will be added to the Datatable allowing the user to select and navigate through the pages.'},
+        cb_showPagination: {value: null, valueDataType: null, isCollection: false, label: ''},
+        recordsPerPage: {value: null, valueDataType: null, isCollection: false, label: 'Number of Records per Page', 
+            helpText: 'Enter the maximum number of records to be displayed on each page.'},
+        showFirstLastButtons: {value: null, valueDataType: null, isCollection: false, label: 'Show First and Last Page Buttons', 
+            helpText: 'When selected, the footer will include buttons to jump to the First and Last pages.'},
+        cb_showFirstLastButtons: {value: CB_TRUE, valueDataType: null, isCollection: false, label: ''},            
         suppressNameFieldLink: {value: null, valueDataType: null, isCollection: false, label: "No link on 'Name field",                     // OBSOLETE as of v3.0.10
             helpText: "Suppress the default behavior of displaying the SObject's 'Name' field as a link to the record"},
         hideCheckboxColumn: {value: null, valueDataType: null, isCollection: false, label: 'Disallow row selection', 
@@ -571,10 +595,6 @@ export default class ers_datatableCPE extends LightningElement {
         },
         {name: 'tableFormatting',
             attributes: [
-                {name: defaults.customHelpDefinition, 
-                    label: 'Configure Columns Button',
-                    helpText: 'Click this button to select the columns(fields) to display.  Additionaly, the Configure Column Wizard will display\n' +
-                    'a sample datatable where you can manipulate it to create the attributes needed to reproduce the format you create.'},
                 {name: 'isDisplayHeader'},    
                 {name: 'tableLabel'},
                 {name: 'tableIcon'},
@@ -583,10 +603,17 @@ export default class ers_datatableCPE extends LightningElement {
                     helpText: 'Select More to show all Icon Types, Select an Icon Type tab to see a list of icons, Select any icon to update the Header Icon value, ' +
                     'Select SELECT TYPE to hide the list of icons.'},
                 {name: 'maxNumberOfRows'},
+                {name: 'showPagination'},
+                {name: 'recordsPerPage'},
+                {name: 'showFirstLastButtons'},
                 {name: 'showRowNumbers'},
                 {name: 'showRecordCount'},
                 {name: 'isShowSearchBar'},
                 {name: 'tableBorder'},
+                {name: defaults.customHelpDefinition, 
+                    label: 'Configure Columns Button',
+                    helpText: 'Click this button to select the columns(fields) to display.  Additionaly, the Configure Column Wizard will display\n' +
+                    'a sample datatable where you can manipulate it to create the attributes needed to reproduce the format you create.'},                
             ]
         },
         {name: 'tableBehavior',
@@ -775,7 +802,9 @@ export default class ers_datatableCPE extends LightningElement {
 
     handleDefaultAttributes() {
         console.log('handle default attributes');
-
+        if (this.inputValues.recordsPerPage.value == null) {
+            this.inputValues.recordsPerPage.value = RECORDS_PER_PAGE.toString();
+        }
     }
 
     handleBuildHelpInfo() {
@@ -1003,7 +1032,7 @@ export default class ers_datatableCPE extends LightningElement {
             let changedAttribute = event.target.name.replace(defaults.inputAttributePrefix, '');
             let newType = event.detail.newValueDataType;
             let newValue = event.detail.newValue;
-            if (changedAttribute == 'maxNumberOfRows' && newType != 'reference') {
+            if ((changedAttribute == 'maxNumberOfRows' || changedAttribute == 'recordsPerPage') && newType != 'reference') {
                 newType = 'Number';
             }
             this.dispatchFlowValueChangeEvent(changedAttribute, newValue, newType);
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js-meta.xml b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js-meta.xml
index f3c8d8116..7fc2419f0 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <isExposed>true</isExposed>
 </LightningComponentBundle>
\ No newline at end of file
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js
index dd5467a28..0d38a2368 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js
@@ -33,7 +33,7 @@ console.log("DATATABLE isCommunity, isFlowBuilder:", isCommunity, isFlowBuilder)
 
 const getConstants = () => {
     return {
-        VERSION_NUMBER : '4.1.6',       // Current Source Code Version #
+        VERSION_NUMBER : '4.2.0',       // Current Source Code Version #
         MAXROWCOUNT : 2000,             // Limit the total number of records to be handled by this component
         ROUNDWIDTH : 5,                 // Used to round off the column widths during Config Mode to nearest value
         WIZROWCOUNT : 6,                // Number of records to display in the Column Wizard datatable
@@ -45,6 +45,7 @@ const getConstants = () => {
         CB_ATTRIB_PREFIX : 'cb_',       // Used with fsc_flowCheckbox component
         MIN_SEARCH_TERM_SIZE : 2,       // Set the minimum number of characters required to start searching
         SEARCH_WAIT_TIME : 300,         // Set the delay to start searching while user is typing a search term
+        RECORDS_PER_PAGE : 9,          // Default number of records per page for pagination
     }
 }
 
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js-meta.xml b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js-meta.xml
index 3fe0e7361..f353f4556 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableUtils/ers_datatableUtils.js-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <isExposed>false</isExposed>
 </LightningComponentBundle>
\ No newline at end of file
diff --git a/flow_screen_components/datatable/sfdx-project.json b/flow_screen_components/datatable/sfdx-project.json
index d6d612700..41acc7e35 100644
--- a/flow_screen_components/datatable/sfdx-project.json
+++ b/flow_screen_components/datatable/sfdx-project.json
@@ -19,7 +19,7 @@
   ],
   "namespace": "",
   "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "59.0",
+  "sourceApiVersion": "60.0",
   "packageAliases": {
     "datatable": "0Ho5G000000XZNaSAO",
     "FlowActionsBasePack": "04t4W000002vXUCQA2",
@@ -89,6 +89,8 @@
     "datatable@4.1.2": "04t5G000004J7MnQAK",
     "datatable@4.1.3": "04t5G000004J7MsQAK",
     "datatable@4.1.4": "04t5G000004J7MxQAK",
-    "datatable@4.1.6": "04t5G000004XZk9QAG"
+    "datatable@4.1.6": "04t5G000004XZk9QAG",
+    "datatable@4.1.7": "04t5G000004XZknQAG",
+    "datatable@4.2.0": "04t5G000004XZlHQAW"
   }
 }
\ No newline at end of file