@refinitiv-ui/efx-grid 6.0.87 → 6.0.89

package/lib/rt-grid/dist/rt-grid.js

@@ -13216,6 +13216,7 @@ DataTable._proto = DataTable.prototype;
 * @property {(string|null)=} label=null
 * @property {boolean=} hidden=true When this row is hidden
 * @property {boolean=} realTime=true Realtime row, able to request for JET/RTK
+* @property {Object=} info=null For storing any additional information to the row
 */
 
 /** @typedef {Object} RowDefinition~RowTypes
@@ -13231,13 +13232,13 @@ DataTable._proto = DataTable.prototype;
 * @public
 * @const
 */
-var ROW_DEF = "ROW_DEF";
+const ROW_DEF = "ROW_DEF";
 
 /** @type {!RowDefinition~RowTypes}
 * @public
 * @const
 */
-var ROW_TYPES = {
+const ROW_TYPES = {
 	CONTENT: "CONTENT",
 	CHAIN: "CHAIN",
 	CONSTITUENT: "CONSTITUENT",
@@ -13249,7 +13250,7 @@ var ROW_TYPES = {
 /** @constructor
 * @param {RowDefinition~Options=} rowOptions
 */
-var RowDefinition = function(rowOptions) {
+let RowDefinition = function(rowOptions) {
 	this._changes = {};
 	if(rowOptions && rowOptions["segmentId"]) { // This row will be classification header row
 		this._dataId = this._rowId = rowOptions["segmentId"];
@@ -13372,6 +13373,11 @@ RowDefinition.prototype._depthLevel = 0;
 * @private
 */
 RowDefinition.prototype._userModel = null;
+/** @type {Object}
+* @private
+*/
+RowDefinition.prototype._info = null;
+
 //#endregion Private Members
 
 /** @public
@@ -13391,7 +13397,7 @@ RowDefinition.prototype.dispose = function() {
 	this._depthLevel = 0;
 	this.unsubscribeForUpdates();
 	if(this._dc) {
-		var rowData = this.getRowData();
+		let rowData = this.getRowData();
 		if(rowData) {
 			rowData[ROW_DEF] = null;
 		}
@@ -13417,9 +13423,9 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 		return;
 	}
 
-	var extractedOptions = RowDefinition.extractRowOptions(rowOptions);
+	let extractedOptions = RowDefinition.extractRowOptions(rowOptions);
 
-	var val = rowOptions["permId"];
+	let val = rowOptions["permId"];
 	if(val != null) {
 		this._permId = val;
 	}
@@ -13448,7 +13454,7 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 	}
 
 	val = rowOptions["collapsed"];
-	var collapsed = extractedOptions["collapsed"];
+	let collapsed = extractedOptions["collapsed"];
 	if(val != null || !collapsed){
 		this._expanded = !collapsed;
 	}
@@ -13456,8 +13462,12 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 	if(val) {
 		this._userModel = rowOptions;
 	}
+	val = rowOptions["info"];
+	if(val) {
+		this._info = val;
+	}
 
-	var symbol = this._ric || this._chainRic;
+	let symbol = this._ric || this._chainRic;
 	if(symbol || this._permId){
 		this.setContent(symbol, extractedOptions); // this._dataId is modified
 	}
@@ -13473,19 +13483,19 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 */
 RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 	this._autoGenerated = true;
-	var parentDef = /** @type{RowDefinition} */(rowOptions["parent"]);
+	let parentDef = /** @type{RowDefinition} */(rowOptions["parent"]);
 	if(this.setParent(parentDef)) {
 		this._dataId = /** @type{string} */(rowOptions["dataId"]); // Constituent will have the same subId as its parent but with different ric
 		this._ric = /** @type{string} */(rowOptions["ric"]);
 		this._dc = parentDef._dc; // Parent chain must have data cache
 		if(this._dc) {
-			var rowData = this.getRowData(); // Do not trigger any data update
+			let rowData = this.getRowData(); // Do not trigger any data update
 			if(rowData) { // Row data from data cache must exist beforehand
 				rowData[ROW_DEF] = this;  // This is for easy referencing from data streaming, also for preventing duplication
 			}
 		}
 	}
-	var val = rowOptions["values"];
+	let val = rowOptions["values"];
 	// eslint-disable-next-line no-undefined
 	if(val !== undefined) {
 		this.setStaticRowData(val, rowOptions["fields"]);
@@ -13508,8 +13518,8 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 		userInput += "";
 	}
 
-	var dirty = (this._userInput !== userInput);
-	var permId = extractedOptions["permId"];
+	let dirty = (this._userInput !== userInput);
+	let permId = extractedOptions["permId"];
 	if(this._permId !== permId){
 		this._permId = permId || "";
 		dirty = true;
@@ -13527,9 +13537,9 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 	if(this._userInput.charAt(0) === "'") { // This is a row header
 		this._ric = this._chainRic = ""; // No ric for realtime request
 	} else {
-		var asChain = extractedOptions["asChain"];
-		var expanded = !extractedOptions["collapsed"];
-		var chainRic = extractedOptions["chainRic"];
+		let asChain = extractedOptions["asChain"];
+		let expanded = !extractedOptions["collapsed"];
+		let chainRic = extractedOptions["chainRic"];
 		if(asChain === true){
 			this._ric = expanded === false ? this._userInput : this._userInput.replace("0#", "");
 			this._expanded = expanded; // Only chain can be expanded by 0#
@@ -13542,8 +13552,8 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 
 	if(this._view) {
 		if(this._isChain){
-			var rid = this.getRowId();
-			var segmentId = this._view.getSegmentParentRowId(rid);
+			let rid = this.getRowId();
+			let segmentId = this._view.getSegmentParentRowId(rid);
 			if(segmentId){
 				this._view.removeSegmentChild(segmentId, rid);
 			}
@@ -13563,7 +13573,7 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 		if(this._dc) {
 			// This will work for runtime ric modification, but not for first initilization.
 			// Avoid losing the ROW_DEF pointer.
-			var rowData = {};
+			let rowData = {};
 			rowData[ROW_DEF] = this; // Enable tracking back and updating data
 			rowData["X_RIC_NAME"] = this.getDisplayText();
 			this.setRowData(rowData);
@@ -13582,8 +13592,8 @@ RowDefinition.prototype.getRowId = function() {
 * @return {RowDefinition~Options}
 */
 RowDefinition.prototype.getConfigObject = function(rowOptions) {
-	var obj = rowOptions || {};
-	var val = this._ric;
+	let obj = rowOptions || {};
+	let val = this._ric;
 	if(val) {
 		obj["ric"] = val;
 	}
@@ -13615,7 +13625,7 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 
 	val = this._userModel;
 	if(val) {
-		obj["keepModel"] = obj;
+		obj["keepModel"] = obj; // This is bad
 	}
 
 	val = this._isChain;
@@ -13634,6 +13644,11 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 		obj["hidden"] = val;
 	}
 
+	val = this._info;
+	if(val) {
+		obj["info"] = this._info;
+	}
+
 	val = this._getStaticRowData();
 	if(val) {
 		obj["values"] = val;
@@ -13641,15 +13656,15 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 
 	// obtain the static values of constituent rows
 	if(this.isChain()) {
-		var children = this.getChildren();
+		let children = this.getChildren();
 		if(children) {
-			var childValues = val ? val[RowDefinition._childDataField] : {};
+			let childValues = val ? val[RowDefinition._childDataField] : {};
 			if(!childValues) {
 				childValues = {};
 			}
-			var dirty = false;
-			var len = children.length;
-			var i, rowDef, staticValues;
+			let dirty = false;
+			let len = children.length;
+			let i, rowDef, staticValues;
 			for(i = 0; i < len; i++) {
 				rowDef = children[i];
 				staticValues = rowDef._getStaticRowData();
@@ -13686,11 +13701,11 @@ RowDefinition.prototype.getType = function() {
 	} else if(this._parent) {
 		return ROW_TYPES.CONSTITUENT;
 	} else {
-		var dv = this._view;
+		let dv = this._view;
 		if(dv) {
-			var rid = this.getRowId();
-			var separator = dv.isSegmentSeparator(rid);
-			var level = dv.getSegmentLevel(rid);
+			let rid = this.getRowId();
+			let separator = dv.isSegmentSeparator(rid);
+			let level = dv.getSegmentLevel(rid);
 			if(separator) {
 				if(level === 1) {
 					return ROW_TYPES.GROUP_HEADER;
@@ -13718,7 +13733,7 @@ RowDefinition.prototype.setDataSource = function(dataSource) {
 		return;
 	}
 
-	var rowData = this.getRowData();
+	let rowData = this.getRowData();
 	if(!rowData) {
 		rowData = {};
 		rowData[ROW_DEF] = this; // Enable tracking back and updating data
@@ -13772,7 +13787,7 @@ RowDefinition.prototype.setStaticRowData = function(data, opt_fields) {
 		this.setRowData(data);
 	}
 };
-/** @public
+/** @private
 * @return {Object.<string, *>}
 */
 RowDefinition.prototype._getStaticRowData = function() {
@@ -13824,7 +13839,7 @@ RowDefinition.prototype.setData = function(field, value) {
 */
 RowDefinition.prototype._clearStaticData = function() {
 	if(this._staticValues) {
-		for(var key in this._staticValues) {
+		for(let key in this._staticValues) {
 			this._staticValues[key] = null;
 		}
 		if(this._dc) {
@@ -13961,19 +13976,19 @@ RowDefinition.prototype.subscribeForUpdates = function() {
 		return false;
 	}
 
-	var subs = this._dc ? this._dc.getSubscriptions() : null;
+	let subs = this._dc ? this._dc.getSubscriptions() : null;
 	if(!subs) {
 		return false;
 	}
 	// TODO: Check if the same subscription is being made.
-	var prevRowData = this.unsubscribeForUpdates();
+	let prevRowData = this.unsubscribeForUpdates();
 
 	if(this.isChain()) {
-		var symbol = this._chainRic;
+		let symbol = this._chainRic;
 		if(!symbol){
 			symbol = this._ric;
 			if(symbol.indexOf("0#") < 0){
-				var count = (symbol.match(/\./g) || []).length;
+				let count = (symbol.match(/\./g) || []).length;
 				if(count < 2){
 					symbol = "0#" + symbol;
 				}
@@ -13999,8 +14014,8 @@ RowDefinition.prototype.unsubscribeForUpdates = function() {
 		return;
 	}
 
-	var subs = this._dc.getSubscriptions();
-	var prevRowData = this.getRowData();
+	let subs = this._dc.getSubscriptions();
+	let prevRowData = this.getRowData();
 
 	subs["removeSubscription"](this._subId);
 	this._subId = "";
@@ -14025,10 +14040,10 @@ RowDefinition.prototype.isSubscribing = function() {
 */
 RowDefinition.prototype.addUpdate = function(e) {
 	if(e) {
-		var changes = e["changes"];
+		let changes = e["changes"];
 		if(changes) {
-			var dirty = 0;
-			for(var field in changes) {
+			let dirty = 0;
+			for(let field in changes) {
 				this._changes[field] = dirty = 1;
 			}
 			if(dirty) {
@@ -14065,7 +14080,7 @@ RowDefinition.prototype.registerToView = function(view, rowId) {
 	}
 	this._view = view;
 
-	var rowData = null;
+	let rowData = null;
 	if(this._subSegment) {
 		rowData = this._view.getRowData(this.getRowId());
 		if(rowData) {
@@ -14077,7 +14092,7 @@ RowDefinition.prototype.registerToView = function(view, rowId) {
 	rowData = {};
 	rowData[ROW_DEF] = this;
 
-	var newRowId = this._view.insertRow(rowId, rowData, this.getRowId());
+	let newRowId = this._view.insertRow(rowId, rowData, this.getRowId());
 	this._rowId = newRowId; // In case there is some duplicate row id.
 
 	if(this._isChain) {
@@ -14108,7 +14123,7 @@ RowDefinition.prototype._deregisterFromView = function(rowIds) {
 * @param {RowDefinition} rowDef
 * @return {Array.<string>}
 * @example
-* var rowIds = descendants.reduce(RowDefinition.deregisterFromView, []);
+* let rowIds = descendants.reduce(RowDefinition.deregisterFromView, []);
 */
 RowDefinition.deregisterFromView = function(rowIds, rowDef) {
 	rowDef._deregisterFromView(rowIds);
@@ -14123,7 +14138,7 @@ RowDefinition.prototype._getChildStaticRowData = function(ric) {
 		return null;
 	}
 
-	var childValues = this._staticValues[RowDefinition._childDataField];
+	let childValues = this._staticValues[RowDefinition._childDataField];
 	if(!childValues) {
 		return null;
 	}
@@ -14143,9 +14158,9 @@ RowDefinition.prototype.addConstituent = function(ric) {
 		return null;
 	}
 
-	var childDef = null;
+	let childDef = null;
 	if(this._children) {
-		for(var i = this._children.length; --i >= 0;) {
+		for(let i = this._children.length; --i >= 0;) {
 			if(this._children[i]._ric === ric) {
 				childDef = this._children[i]; // Constituent has already been added
 				break;
@@ -14155,16 +14170,16 @@ RowDefinition.prototype.addConstituent = function(ric) {
 		this._children = [];
 	}
 
-	var newChild = !childDef;
+	let newChild = !childDef;
 	if(newChild) {
-		var rowOptions = {
+		let rowOptions = {
 			"asConstituent": true,
 			"dataId": this._subId + ric,
 			"ric": ric,
 			"parent": this
 		};
 
-		var staticData = this._getChildStaticRowData(ric);
+		let staticData = this._getChildStaticRowData(ric);
 		if(staticData) {
 			rowOptions["values"] = staticData;
 		}
@@ -14173,11 +14188,11 @@ RowDefinition.prototype.addConstituent = function(ric) {
 	}
 
 	if(this._view) {
-		var rowId = this.getRowId();
+		let rowId = this.getRowId();
 		// WARNING: insert position, we prioritize using CHILD_ORDER (From server) in dc first. If it does not exist, the last row of the segment will be pushed
-		var childOrder = childDef.getData("CHILD_ORDER");
-		var parentIndex =  this._view.getRowIndex(rowId);
-		var position =  parentIndex + this.getChildCount(); // push the last position
+		let childOrder = childDef.getData("CHILD_ORDER");
+		let parentIndex =  this._view.getRowIndex(rowId);
+		let position =  parentIndex + this.getChildCount(); // push the last position
 		if(childOrder != null) {
 			// Warning: We need to carry a value of 1 because the CHILD_ORDER starts with 0, and it will be added to the parentIndex. In case the parent rowIndex is not included.
 			position = parentIndex + childOrder + 1; // insert between segment
@@ -14191,7 +14206,7 @@ RowDefinition.prototype.addConstituent = function(ric) {
 };
 
 /** Used to convert autogenerated row to regular real-time row
-* @public
+* @private
 */
 RowDefinition.prototype._toRealTimeRow = function() {
 	if(!this._ric) { // Empty row
@@ -14219,19 +14234,19 @@ RowDefinition.prototype.unlinkChain = function() {
 	}
 
 	if(this.isChainExpanded()) {
-		var rowDefs = this.getDescendants();
-		var len = rowDefs.length;
-		for(var i = 0; i < len; i++) {
+		let rowDefs = this.getDescendants();
+		let len = rowDefs.length;
+		for(let i = 0; i < len; i++) {
 			rowDefs[i]._toRealTimeRow();
 		}
 	}
 
 	this.unsubscribeForUpdates();
 
-	var view = this._view;
+	let view = this._view;
 	if(view) {
-		var rid = this.getRowId();
-		var segment = view.getSegment(rid);
+		let rid = this.getRowId();
+		let segment = view.getSegment(rid);
 		if(segment) {
 			segment.setClassification(null);
 		}
@@ -14314,10 +14329,10 @@ RowDefinition.prototype.getDescendants = function(ary) {
 		ary = [];
 	}
 	if(this._children) {
-		var chdr = this._children;
-		var len = chdr.length;
-		for(var i = 0; i < len; ++i) {
-			var ch = chdr[i];
+		let chdr = this._children;
+		let len = chdr.length;
+		for(let i = 0; i < len; ++i) {
+			let ch = chdr[i];
 			ary.push(ch);
 			ch.getDescendants(ary);
 		}
@@ -14329,7 +14344,7 @@ RowDefinition.prototype.getDescendants = function(ary) {
 * @return {Array.<string>} Null if there is no row Id
 */
 RowDefinition.prototype.getAllDescendantIds = function() {
-	var descendants = this.getDescendants();
+	let descendants = this.getDescendants();
 	if(descendants.length) {
 		return descendants.map(RowDefinition.toRowId);
 	} else {
@@ -14358,7 +14373,7 @@ RowDefinition.prototype.setParent = function(parentDef) {
 		return false;
 	}
 	if(this._parent) { // Release from previous parent
-		var at = this._parent._children.lastIndexOf(this);
+		let at = this._parent._children.lastIndexOf(this);
 		if(at >= 0) {
 			this._parent._children.splice(at, 1);
 		}
@@ -14410,12 +14425,26 @@ RowDefinition.prototype.setGroupOrder = function(num) {
 };
 
 /** @public
+* @ignore
 * @return {Object}
 */
 RowDefinition.prototype.getUserModel = function() {
 	return this._userModel;
 };
 
+/** @public
+* @param {Object} obj
+*/
+RowDefinition.prototype.setRowInfo = function(obj) {
+	this._info = obj;
+};
+/** @public
+* @return {Object}
+*/
+RowDefinition.prototype.getRowInfo = function() {
+	return this._info;
+};
+
 /** For mapping row Id by Array.map()
 * @public
 * @function
@@ -14433,15 +14462,15 @@ RowDefinition.toRowId = function(rowDef) {
 * @return {RowDefinition~Options}
 */
 RowDefinition.extractRowOptions = function(rowOptions) {
-	var ric = rowOptions["ric"];
-	var permId = rowOptions["permId"];
-	var chainRic = rowOptions["chainRic"];
-	var collapsed = rowOptions["collapsed"];
-	var asChain = rowOptions["asChain"];
+	let ric = rowOptions["ric"];
+	let permId = rowOptions["permId"];
+	let chainRic = rowOptions["chainRic"];
+	let collapsed = rowOptions["collapsed"];
+	let asChain = rowOptions["asChain"];
 	if(asChain == null && chainRic){
 		asChain = true;
 	}
-	var expanded = null;
+	let expanded = null;
 	if(ric && ric.indexOf("0#") >= 0){
 		if(asChain == null){
 			asChain = true;
@@ -14449,7 +14478,7 @@ RowDefinition.extractRowOptions = function(rowOptions) {
 		expanded = true;
 	}
 
-	var extractedOptions = {};
+	let extractedOptions = {};
 	if(collapsed == null) {
 		extractedOptions["collapsed"] = !expanded;
 	} else {
@@ -14485,13 +14514,13 @@ RowDefinition.dispose = function(rowDef) {
 * @private
 * @const
 */
-var SYNAPSE_URL =
+const SYNAPSE_URL =
 	"/synapse/service/suggestions/suggest/?"
 	+ "hits=1" // search only 1 result
 	+ "&profile=" + encodeURIComponent("Field Selector");
 
 /* @namespace */
-var FieldDefinition = {};
+let FieldDefinition = {};
 
 /** @type {Object.<string, Object>}
 * @private
@@ -14633,7 +14662,7 @@ FieldDefinition.set = function(field, def) {
 	if (!FieldDefinition._defs[field]) {
 		FieldDefinition._defs[field] = def;
 	} else {
-		for (var key in def) {
+		for (let key in def) {
 			FieldDefinition._defs[field][key] = def[key];
 		}
 	}
@@ -14661,7 +14690,7 @@ FieldDefinition.getFieldInfo = FieldDefinition.get;
 * @return {boolean}
 */
 FieldDefinition.hasFieldInfo = function(field) {
-	var val = FieldDefinition.get(field);
+	let val = FieldDefinition.get(field);
 	return (val && val.field) ? true : false; // Already preventing an error caused by accessing a property on a null value
 };
 
@@ -14774,7 +14803,7 @@ FieldDefinition.isTimeSeries = function (field) {
 	}
 
 	// We can check time series using a cache to avoid duplicating checks in regular expressions.
-	var timeSeriesField = FieldDefinition.getFieldProperty(field, "timeSeries");
+	let timeSeriesField = FieldDefinition.getFieldProperty(field, "timeSeries");
 	if (timeSeriesField != null) {
 		return timeSeriesField;
 	}
@@ -14789,7 +14818,7 @@ FieldDefinition.isTimeSeries = function (field) {
 		[\)]$                   => end with only )
 		i						=> for match both upper and lower cases
 	*/
-	var timeSeriesRegex = /^TR\.[\w]+\([\w\-\=\,]*(?:EDATE|SDATE)\=+[\w\-\=\,]*[ \w]*\)$/i;
+	let timeSeriesRegex = /^TR\.[\w]+\([\w\-\=\,]*(?:EDATE|SDATE)\=+[\w\-\=\,]*[ \w]*\)$/i;
 	return timeSeriesRegex.test(field);
 };
 
@@ -14815,7 +14844,7 @@ FieldDefinition.setFieldProperty = function(field, propertyName, value) {
  * @return {*}
  */
 FieldDefinition.getFieldProperty = function(field, propertyName) {
-	var fieldDef = FieldDefinition._defs[field];
+	let fieldDef = FieldDefinition._defs[field];
 	if(fieldDef) {
 		return fieldDef[propertyName];
 	}
@@ -14832,8 +14861,8 @@ FieldDefinition.loadFieldInfo = function (field) {
 		return FieldDefinition._loadingField[field].promise;
 	}
 
-	var defer = new Deferred();
-	var synapse = FieldDefinition._synapse;
+	let defer = new Deferred();
+	let synapse = FieldDefinition._synapse;
 	// cannot call request without synapse config
 	if (!synapse) {
 		defer.resolve(null);
@@ -14844,7 +14873,7 @@ FieldDefinition.loadFieldInfo = function (field) {
 	}
 	// in debug using mock data instead
 	else if (synapse.debug) {
-		var mockData = this._mockOnLoadEndData(field, defer);
+		let mockData = this._mockOnLoadEndData(field, defer);
 		setTimeout(onLoadEnd.bind(null, mockData), 1000);
 	}
 	// cannot call request without apiKey and  contextApp
@@ -14853,7 +14882,7 @@ FieldDefinition.loadFieldInfo = function (field) {
 	}
 	// everything fine, call synapse service
 	else {
-		var queryUrl = SYNAPSE_URL
+		let queryUrl = SYNAPSE_URL
 			+ "&api-key=" + encodeURIComponent(synapse.apiKey)
 			+ "&contextApp=" + encodeURIComponent(synapse.contextApp)
 			+ "&language=" + encodeURIComponent(FieldDefinition._lang)
@@ -14862,7 +14891,7 @@ FieldDefinition.loadFieldInfo = function (field) {
 			queryUrl += "&auth=" + encodeURIComponent(synapse.auth);
 		}
 		// TODO: handle client timeout
-		var xmr = new XMLHttpRequest();
+		let xmr = new XMLHttpRequest();
 		xmr._defer = defer;
 		xmr._field = field;
 		FieldDefinition._loadingField[field] = defer;
@@ -14895,16 +14924,16 @@ function onError(e) {
 * @returns {Object}
 */
 FieldDefinition._mockOnLoadEndData = function (field, defer) {
-	var fieldUpperCase = field.toUpperCase();
-	var fieldLowerCase = fieldUpperCase.toLowerCase();
-	var label;
+	let fieldUpperCase = field.toUpperCase();
+	let fieldLowerCase = fieldUpperCase.toLowerCase();
+	let label;
 	if (fieldLowerCase.indexOf("_") === 2) { // transform XX_ABCD -> Abcd
 		label = fieldUpperCase[3] + fieldLowerCase.substring(4);
 	} else {
 		label = fieldUpperCase[0] + fieldLowerCase.substring(1);
 	}
-	var dataType = (fieldUpperCase.indexOf("DATE") >= 0) ? "DATE" : "PRICE";
-	var item = {
+	let dataType = (fieldUpperCase.indexOf("DATE") >= 0) ? "DATE" : "PRICE";
+	let item = {
 		cmd: label,
 		explanation: null,
 		fr: false,
@@ -14933,7 +14962,7 @@ FieldDefinition._mockOnLoadEndData = function (field, defer) {
 		vc: "FLD"
 	};
 
-	var response = {
+	let response = {
 		action: '\"' + fieldUpperCase + '\" SRCH',
 		assetClassifierExplanation: "AssetClassifier is disabled.",
 		assetClassifierStatus: "NOT_INVOKED",
@@ -14958,21 +14987,21 @@ FieldDefinition._mockOnLoadEndData = function (field, defer) {
 * @param {Event} e
 */
 function onLoadEnd(e) {
-	var xmr = e.currentTarget;
-	var defer = xmr._defer;
-	var field = xmr._field;
+	let xmr = e.currentTarget;
+	let defer = xmr._defer;
+	let field = xmr._field;
 
 	delete FieldDefinition._loadingField[field];
 
 	if (xmr.status === 200) { // case success
-		var res = JSON.parse(xmr.responseText);
-		var fieldDef = null;
+		let res = JSON.parse(xmr.responseText);
+		let fieldDef = null;
 
-		var result = res.result && res.result[0];
+		let result = res.result && res.result[0];
 		if (result) {
-			var item = result.hits && result.hits[0];
+			let item = result.hits && result.hits[0];
 			if (item && item.p) {
-				var profile = item.p;
+				let profile = item.p;
 				if (profile.fn.toUpperCase() === field.toUpperCase()) {
 					fieldDef = FieldDefinition.get(field) || {};
 
@@ -15011,7 +15040,7 @@ function onLoadEnd(e) {
 }
 
 (function() { // Add "field" property to all default field definitions. This reduces file size and redundancy
-	for(var key in FieldDefinition._defs) {
+	for(let key in FieldDefinition._defs) {
 		FieldDefinition._defs[key]["field"] = key;
 	}
 })();
@@ -15022,7 +15051,7 @@ function onLoadEnd(e) {
 // CONCATENATED MODULE: ./src/js/PredefinedFormula.js
 
 /* @constructor */
-var PredefinedFormula = {};
+let PredefinedFormula = {};
 /** @private
 * @type {Object<string, string>}
 */
@@ -15106,14 +15135,14 @@ PredefinedFormula.remove = function(field) {
 * @property {boolean=} stationary=false If enabled, the column order cannot be changed (i.e., this column and any column to its left cannot be moved)
 * @property {boolean=} leftPinned=false If enabled, the column will not be part of the scrollable area and is pinned to the left side
 * @property {boolean=} rightPinned=false If enabled, the column will not be part of the scrollable area and is pinned to the right side
-* @property {Object=} info=null Store additional information
+* @property {Object=} info=null For storing any additional information to the column
 */
 
 /** mapping of field type to javascript type
 * @type {Object.<string, string>}
 * @private
 */
-var TYPE_MAPPING = {
+const TYPE_MAPPING = {
 	STRING: "string",
 	BOOLEAN: "boolean",
 	NUMBER: "number",
@@ -15139,15 +15168,15 @@ var TYPE_MAPPING = {
 * @public
 * @const
 */
-var COL_DEF = "COL_DEF";
+const COL_DEF = "COL_DEF";
 
 /** @private
 * @param {string} str
 * @return {string}
 */
-var _toAlignment = function(str) {
+let _toAlignment = function(str) {
 	if(str) {
-		var ch = str.charAt(0).toLowerCase();
+		let ch = str.charAt(0).toLowerCase();
 		if(ch === "l") {
 			return "left";
 		}
@@ -15165,7 +15194,7 @@ var _toAlignment = function(str) {
 * @param {ColumnDefinition~Options=} columnOption
 * @param {*=} hostGrid
 */
-var ColumnDefinition = function(columnOption, hostGrid) {
+let ColumnDefinition = function(columnOption, hostGrid) {
 	this._defaultRenderer = this._defaultRenderer.bind(this);
 	this._customRenderer = this._customRenderer.bind(this);
 
@@ -15337,7 +15366,7 @@ ColumnDefinition.prototype.dispose = function() {
 */
 ColumnDefinition.prototype._initializeTimeSeriesChild = function(columnOption) {
 	this._autoGenerated = true;
-	var parentDef = /** @type{ColumnDefinition} */(columnOption["parent"]);
+	let parentDef = /** @type{ColumnDefinition} */(columnOption["parent"]);
 	this._setParent(parentDef);
 	this.initialize(columnOption);
 };
@@ -15349,13 +15378,13 @@ ColumnDefinition.prototype.initialize = function(columnOption) {
 		return;
 	}
 
-	var i, len, key, val;
+	let i, len, key, val;
 	//#region Apply pre-defined option
-	var field = columnOption["field"]; // Field could be null or undefined here
-	var defaultOption = js_FieldDefinition.get(field);
+	let field = columnOption["field"]; // Field could be null or undefined here
+	let defaultOption = js_FieldDefinition.get(field);
 	if(defaultOption && defaultOption !== columnOption) { // The column match the default field list
 		// WARNING: This changes reference of the user object. Any new property added won't affect anything outside of this method
-		var userOption = columnOption;
+		let userOption = columnOption;
 		columnOption = {}; // Create a new object for cloning process
 
 		for(key in defaultOption) {
@@ -15546,7 +15575,7 @@ ColumnDefinition.prototype.getFieldDefinition = function () {
 * @return {string}
 */
 ColumnDefinition.prototype.getFieldDataType = function () {
-	var fieldDef = this.getFieldDefinition();
+	let fieldDef = this.getFieldDefinition();
 	if(fieldDef && fieldDef.fieldDataType) {
 		return fieldDef.fieldDataType;
 	}
@@ -15559,7 +15588,7 @@ ColumnDefinition.prototype.getFieldDataType = function () {
 ColumnDefinition.prototype.getDataType = function () {
 	if(this._dataType) return this._dataType;
 
-	var fieldDataType = this.getFieldDataType();
+	let fieldDataType = this.getFieldDataType();
 	if(fieldDataType) {
 		return TYPE_MAPPING[fieldDataType.toUpperCase()];
 	}
@@ -15570,7 +15599,7 @@ ColumnDefinition.prototype.getDataType = function () {
 * @param {string} dataType
 */
 ColumnDefinition.prototype.setDataType = function (dataType) {
-	var val = TYPE_MAPPING[dataType.toUpperCase()];
+	let val = TYPE_MAPPING[dataType.toUpperCase()];
 	if(val) {
 		dataType = val;
 	}
@@ -15582,9 +15611,9 @@ ColumnDefinition.prototype.setDataType = function (dataType) {
 * @return {string}
 */
 ColumnDefinition.getDataType = function(field) {
-	var fieldDef = js_FieldDefinition.get(field);
+	let fieldDef = js_FieldDefinition.get(field);
 	if(fieldDef) {
-		var fieldDataType = fieldDef.fieldDataType ? fieldDef.fieldDataType.toUpperCase() : null;
+		let fieldDataType = fieldDef.fieldDataType ? fieldDef.fieldDataType.toUpperCase() : null;
 		return TYPE_MAPPING[fieldDataType] ? TYPE_MAPPING[fieldDataType] : "";
 	}
 	return "";
@@ -15601,12 +15630,12 @@ ColumnDefinition.prototype.getTooltip = function() {
 		}
 	}
 
-	var name = this.getName();
+	let name = this.getName();
 	if(name) {
 		return name;
 	}
 
-	var field = this.getField();
+	let field = this.getField();
 	if(field) {
 		return field;
 	}
@@ -15626,7 +15655,7 @@ ColumnDefinition.prototype.getField = function() {
 * @return {!Array.<string>}
 */
 ColumnDefinition.prototype.getAllFields = function() {
-	var field = this.getField();
+	let field = this.getField();
 	if(field) {
 		return this._requiredFields.concat(field);
 	}
@@ -15689,10 +15718,10 @@ ColumnDefinition.getRealTimeFields = function(fields, colDef) {
 	}
 
 	// TODO: Exclude any formula references from requesting real-time field
-	var reqFields = colDef.getRequiredFields();
-	var len = reqFields.length;
-	for(var i = 0; i < len; ++i) {
-		var field = reqFields[i];
+	let reqFields = colDef.getRequiredFields();
+	let len = reqFields.length;
+	for(let i = 0; i < len; ++i) {
+		let field = reqFields[i];
 		if(ColumnDefinition.isRealTimeField(field)) {
 			fields.push(field);
 		}
@@ -15710,9 +15739,9 @@ ColumnDefinition.prototype.isSortable = function() {
 * @return {boolean}
 */
 ColumnDefinition.prototype.isScalable = function() {
-	var core = this._eventArg["core"];
-	var grid = this._eventArg["grid"];
-	var colIndex = grid.getColumnIndex(this);
+	let core = this._eventArg["core"];
+	let grid = this._eventArg["grid"];
+	let colIndex = grid.getColumnIndex(this);
 	return core.getColumnScalability(colIndex);
 };
 /** Deprecated, this function will be return initial sort order of this column, The current sort state may be different from initial sort state.
@@ -15728,27 +15757,27 @@ ColumnDefinition.prototype.getInitialSortOrder = function() {
 * @return {number}
 */
 ColumnDefinition.prototype.getWidth = function() {
-	var core = this._eventArg["core"];
-	var grid = this._eventArg["grid"];
-	var colIndex = grid.getColumnIndex(this);
+	let core = this._eventArg["core"];
+	let grid = this._eventArg["grid"];
+	let colIndex = grid.getColumnIndex(this);
 	return core.getColumnWidth(colIndex);
 };
 /** @public
 * @return {number}
 */
 ColumnDefinition.prototype.getMinWidth = function() {
-	var core = this._eventArg["core"];
-	var grid = this._eventArg["grid"];
-	var colIndex = grid.getColumnIndex(this);
+	let core = this._eventArg["core"];
+	let grid = this._eventArg["grid"];
+	let colIndex = grid.getColumnIndex(this);
 	return core.getMinimumColumnWidth(colIndex);
 };
 /** @public
 * @return {string}
 */
 ColumnDefinition.prototype.getTextAlign = function() {
-	var core = this._eventArg["core"];
-	var grid = this._eventArg["grid"];
-	var colIndex = grid.getColumnIndex(this);
+	let core = this._eventArg["core"];
+	let grid = this._eventArg["grid"];
+	let colIndex = grid.getColumnIndex(this);
 	return core.getColumnAlignment(colIndex);
 };
 /** @public
@@ -15775,7 +15804,7 @@ ColumnDefinition.prototype.getClasses = function() {
 * @return {!Object}
 */
 ColumnDefinition.prototype.getConfigObject = function(colOptions) {
-	var obj = colOptions || {};
+	let obj = colOptions || {};
 
 	if(this._info){
 		obj["info"] = this._info;
@@ -15783,14 +15812,14 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 
 	if(obj["field"] == null) {
 		if(!this._defaultField) {
-			var field = this.getField();
+			let field = this.getField();
 			if(field) {
 				obj["field"] = field;
 			}
 		}
 	}
 
-	var value = this.getDataType();
+	let value = this.getDataType();
 	if(value) {
 		obj["dataType"] = value;
 	}
@@ -15825,7 +15854,7 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 		obj["sortable"] = false;
 	}
 
-	var classes = this._classes;
+	let classes = this._classes;
 	if(classes && classes.length > 0) {
 		obj["className"] = classes.join(" ");
 	}
@@ -15842,13 +15871,13 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 		obj["autoGenerated"] = this._autoGenerated;
 	}
 
-	var core = this._eventArg["core"];
-	var grid = this._eventArg["grid"];
-	var colIndex = grid.getColumnIndex(this);
+	let core = this._eventArg["core"];
+	let grid = this._eventArg["grid"];
+	let colIndex = grid.getColumnIndex(this);
 
 	// The scalable, width and minWidth cannot be shifted into core as getConfigObject is accessible from colDef.
-	var scalable = core.getColumnScalability(colIndex);
-	var width = core.getColumnCustomLaneSize(colIndex);
+	let scalable = core.getColumnScalability(colIndex);
+	let width = core.getColumnCustomLaneSize(colIndex);
 
 	if (scalable !== true || width !== 1) {
 		obj["scalable"] = scalable;
@@ -15878,9 +15907,9 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 * @return {boolean}
 */
 ColumnDefinition.prototype.isHidden = function() {
-	var core = this._eventArg["core"];
-	var grid = this._eventArg["grid"];
-	var colIndex = grid.getColumnIndex(this);
+	let core = this._eventArg["core"];
+	let grid = this._eventArg["grid"];
+	let colIndex = grid.getColumnIndex(this);
 	return !core.isColumnVisible(colIndex);
 };
 /** @public
@@ -15893,9 +15922,9 @@ ColumnDefinition.prototype.isTextSelect = function () {
 * @param {boolean=} bool
 */
 ColumnDefinition.prototype.hide = function(bool) {
-	var core = this._eventArg["core"];
-	var grid = this._eventArg["grid"];
-	var colIndex = grid.getColumnIndex(this);
+	let core = this._eventArg["core"];
+	let grid = this._eventArg["grid"];
+	let colIndex = grid.getColumnIndex(this);
 	core.hideColumn(colIndex, bool !== false);
 };
 /** This will clear all previously stored renderers and set a new one.
@@ -15987,9 +16016,9 @@ ColumnDefinition.prototype.addRenderer = function(func) {
 * @return {boolean} Current activation state after the call
 */
 ColumnDefinition.prototype.activateRenderer = function(id, func) {
-	var renderer = null;
+	let renderer = null;
 	if (id != null) {
-		var rendererMap = this._rendererMap;
+		let rendererMap = this._rendererMap;
 		if (!rendererMap) {
 			rendererMap = this._rendererMap = {};
 		}
@@ -16060,10 +16089,10 @@ ColumnDefinition.prototype._setField = function(field, columnOption) {
 	}
 	field = field.trim();
 
-	var formulaStr = columnOption ? columnOption["formula"] : "";
+	let formulaStr = columnOption ? columnOption["formula"] : "";
 	if(this._fnEngine) {
-		var uppercasedF = field.toUpperCase(); // For comparison only
-		var predefinedF = formulaStr || js_PredefinedFormula.get(uppercasedF);
+		let uppercasedF = field.toUpperCase(); // For comparison only
+		let predefinedF = formulaStr || js_PredefinedFormula.get(uppercasedF);
 		if(predefinedF || ColumnDefinition.isFormulaField(field)) {
 			field = formula_Formula.toUpperCase(field);
 			this._formula = this._fnEngine.addFormula(predefinedF || field); // Always a success
@@ -16085,7 +16114,7 @@ ColumnDefinition.prototype._setField = function(field, columnOption) {
 	// We need to cache time series in field definition for improve performance of checking methond
 	js_FieldDefinition.setFieldProperty(field, "timeSeries", js_FieldDefinition.isTimeSeries(field) ? true : false);
 
-	var parentColDef = columnOption["parent"];
+	let parentColDef = columnOption["parent"];
 	if(columnOption && parentColDef) {
 		js_FieldDefinition.setFieldProperty(field, "timeSeriesParent", parentColDef.getField());
 	}
@@ -16102,12 +16131,12 @@ ColumnDefinition.prototype._retrieveNestedFields = function(fields) {
 	if(!fields) {
 		return;
 	}
-	for(var i = fields.length; --i >= 0;) {
-		var field = fields[i];
-		var uppercasedF = field.toUpperCase();
-		var predefinedF = js_PredefinedFormula.get(uppercasedF);
+	for(let i = fields.length; --i >= 0;) {
+		let field = fields[i];
+		let uppercasedF = field.toUpperCase();
+		let predefinedF = js_PredefinedFormula.get(uppercasedF);
 		if(predefinedF) { // Predefined formula
-			var f = this._fnEngine.getFormula(field); // Get formula by reference name
+			let f = this._fnEngine.getFormula(field); // Get formula by reference name
 			if(f) {
 				f.addFormulaCount(); // Add reference count
 			} else {
@@ -16125,18 +16154,18 @@ ColumnDefinition.prototype._retrieveNestedFields = function(fields) {
 * @param {Object} e
 */
 ColumnDefinition.prototype._defaultRenderer = function(e) {
-	var rowDef = /** @type{RowDefinition} */(e["dataValue"]);
+	let rowDef = /** @type{RowDefinition} */(e["dataValue"]);
 	e["cell"].setContent(rowDef ? rowDef.getData(this._field) : null);
 };
 /** @private
 * @param {Object} e
 */
 ColumnDefinition.prototype._customRenderer = function(e) {
-	var rowDef = /** @type{RowDefinition} */(e["dataValue"]);
+	let rowDef = /** @type{RowDefinition} */(e["dataValue"]);
 
-	var arg = this._eventArg; // Reuse the same object
+	let arg = this._eventArg; // Reuse the same object
 	if(rowDef) {
-		var rowData = rowDef.getRowData();
+		let rowData = rowDef.getRowData();
 		arg["rowDef"] = rowDef;
 		arg["rowData"] = rowData;
 		arg["rowIndex"] = e["rowIndex"];
@@ -16155,9 +16184,9 @@ ColumnDefinition.prototype._customRenderer = function(e) {
 	if(this._activatedRenderer) {
 		this._activatedRenderer(arg);
 	} else {
-		var urs = this._userRenderers;
-		var len = urs.length;
-		for(var i = 0; i < len; ++i) {
+		let urs = this._userRenderers;
+		let len = urs.length;
+		for(let i = 0; i < len; ++i) {
 			urs[i](arg);
 		}
 	}
@@ -16222,7 +16251,7 @@ ColumnDefinition.prototype._setCoreColumnDef = function(obj) {
 * @constructor
 * @extends {EventDispatcher}
 */
-var SnapshotFiller = function () {
+let SnapshotFiller = function () {
 	this._onRequest = this._onRequest.bind(this);
 
 	this._rics = {};
@@ -16305,16 +16334,16 @@ SnapshotFiller.clearMockAdc = function() {
 */
 SnapshotFiller.prototype.setADCOptions = function (adcOptions) {
 
-	var val = adcOptions["productId"];
+	let val = adcOptions["productId"];
 	if(val) {
 		this._adcOptions.productId = val;
 	}
 	// TODO: support requesting level parameter https://confluence.refinitiv.com/display/ADC/Request+level+parameters
-	// var val = adcOptions["lang"];
+	// let val = adcOptions["lang"];
 	// if(val) {
 	// 	this._adcOptions.lang = val;
 	// }
-	// var val = adcOptions["cache"];
+	// let val = adcOptions["cache"];
 	// if(val) {
 	// 	this._adcOptions.cache = val;
 	// }
@@ -16342,10 +16371,10 @@ SnapshotFiller.prototype.addRic = function (ric) {
 * @return {boolean}
 */
 SnapshotFiller.prototype.addRics = function (rics) {
-	var len = rics ? rics.length : 0;
-	var dirty = false;
-	for(var i = 0; i < len; ++i) {
-		var ric = rics[i];
+	let len = rics ? rics.length : 0;
+	let dirty = false;
+	for(let i = 0; i < len; ++i) {
+		let ric = rics[i];
 		if (ric && !this._rics[ric]) {
 			this._rics[ric] = 1;
 			dirty = true;
@@ -16370,9 +16399,9 @@ SnapshotFiller.prototype.addField = function (str) {
 * @return {boolean}
 */
 SnapshotFiller.prototype.addFields = function (fields) {
-	var len = fields.length;
-	var dirty = 0;
-	for(var i = 0; i < len; ++i) {
+	let len = fields.length;
+	let dirty = 0;
+	for(let i = 0; i < len; ++i) {
 		dirty |= this._addField(fields[i]);
 	}
 	if(dirty) {
@@ -16417,7 +16446,7 @@ SnapshotFiller.prototype._request = function () {
 SnapshotFiller.prototype._onRequest = function () {
 	this._timerId = 0;
 
-	var jet = window["JET"]; // Assume that JET is already exist.
+	let jet = window["JET"]; // Assume that JET is already exist.
 	if (this._rtk) {
 		if (!this._rtk.Data) {
 			return; // Require RTK.Data plugin to get snapshot data
@@ -16427,20 +16456,20 @@ SnapshotFiller.prototype._onRequest = function () {
 	}
 
 	// Retrieve instruments and ADC fields
-	var instruments = Object.keys(this._rics);
+	let instruments = Object.keys(this._rics);
 
-	var i;
-	var fields = [];
-	var timeSeriesFields = [];
-	for (var field in this._fields) {
+	let i;
+	let fields = [];
+	let timeSeriesFields = [];
+	for (let field in this._fields) {
 		if(!FieldDefinition.isTimeSeries(field)) {
 			fields.push(field);
 		} else {
 			timeSeriesFields.push(field);
 		}
 	}
-	var fieldLen = fields.length;
-	var timeSeriesFieldLen = timeSeriesFields.length;
+	let fieldLen = fields.length;
+	let timeSeriesFieldLen = timeSeriesFields.length;
 
 	if ( (!fieldLen && !timeSeriesFieldLen ) || !instruments.length) { // No ADC field or real-time RIC
 		return;
@@ -16450,13 +16479,13 @@ SnapshotFiller.prototype._onRequest = function () {
 	this._rics = {};
 	this._fields = {};
 
-	var onSuccess, payload;
+	let onSuccess, payload;
 	if (this._rtk) {
-		var strFields;
+		let strFields;
 		// Request time serie fields
 		if(timeSeriesFields.length > 0) {
 			// request time series field
-			var strtTimeSeriesFields = timeSeriesFields.join(',');
+			let strtTimeSeriesFields = timeSeriesFields.join(',');
 			payload = {
 				"method": "select",
 				"formula": strtTimeSeriesFields,
@@ -16465,7 +16494,7 @@ SnapshotFiller.prototype._onRequest = function () {
 				"output": "Col,date|,Row,In|,va,T,NoEmptyTickers" // For customize output server, for more information please visit "https://confluence.refinitiv.com/display/ADC/Data+Cloud+Output+Format"
 			};
 			onSuccess = this._onRTKTimeSeriesSuccess.bind(this, timeSeriesFields);
-			var responseMockAdc = SnapshotFiller.getMockAdc(payload.formula);
+			let responseMockAdc = SnapshotFiller.getMockAdc(payload.formula);
 			if(responseMockAdc) {
 				setTimeout(function() {
 					onSuccess(responseMockAdc);
@@ -16501,7 +16530,7 @@ SnapshotFiller.prototype._onRequest = function () {
 
 
 	} else {
-		var reqFields = [];
+		let reqFields = [];
 		for(i = 0; i < fieldLen; i++) {
 			reqFields.push({ "name": fields[i] });
 		}
@@ -16527,8 +16556,8 @@ SnapshotFiller.prototype._onRequest = function () {
 */
 SnapshotFiller.prototype._onJETSuccess = function (fields, serverResult) {
 	this._dispatch("adcDataReceived", serverResult);
-	var data2D = serverResult["data"];
-	var svHeaders = serverResult["headers"] && serverResult["headers"][0];
+	let data2D = serverResult["data"];
+	let svHeaders = serverResult["headers"] && serverResult["headers"][0];
 
 	if (!Array.isArray(data2D) || !Array.isArray(svHeaders)) {
 		return; //TODO: Return Promise.reject(errMsg);
@@ -16538,11 +16567,11 @@ SnapshotFiller.prototype._onJETSuccess = function (fields, serverResult) {
 	// Server will return field only in UPPERCASE
 	// ex. requestField = TR.Volume ===> serverField = TR.VOLUME
 	// so we need convert UPPERCASE to be original
-	var i, field, ric;
-	var j = 1; //  to skip instrument index, use j = 1
-	var fLength = fields.length;
-	var hLength = svHeaders.length;
-	var headers = new Array(hLength);
+	let i, field, ric;
+	let j = 1; //  to skip instrument index, use j = 1
+	let fLength = fields.length;
+	let hLength = svHeaders.length;
+	let headers = new Array(hLength);
 	for (i = 0; i < fLength && j < hLength; i++) {
 		field = fields[i];
 		if (svHeaders[j].field === field.toUpperCase()) {
@@ -16551,24 +16580,24 @@ SnapshotFiller.prototype._onJETSuccess = function (fields, serverResult) {
 		}
 	}
 
-	var len = data2D.length;
-	var fieldLen = headers.length;
-	var ricMap = {};
+	let len = data2D.length;
+	let fieldLen = headers.length;
+	let ricMap = {};
 
 	// TODO: Freeze the data view before setting multiple data
 	for (i = 0; i < len; i++) {
-		var dataRow = data2D[i];
+		let dataRow = data2D[i];
 		ric = dataRow[0];
 
 		if (ricMap[ric]) {
 			continue; // we interested only first row of ric
 		}
 
-		var snapData = ricMap[ric] = {};
+		let snapData = ricMap[ric] = {};
 
 		// loop for create rowData for update
 		for (j = 1; j < fieldLen; j++) { //  to skip instrument index, use j = 1
-			var value = dataRow[j];
+			let value = dataRow[j];
 			if (value != null && value !== "") {
 				field = headers[j];
 				snapData[field] = value;
@@ -16577,9 +16606,9 @@ SnapshotFiller.prototype._onJETSuccess = function (fields, serverResult) {
 	}
 
 	// return result only ric that has update data
-	var updatedData = {};
+	let updatedData = {};
 	for (ric in ricMap) {
-		var obj = ricMap[ric];
+		let obj = ricMap[ric];
 		if (!isEmptyObject(obj)) {
 			updatedData[ric] = obj;
 		}
@@ -16597,8 +16626,8 @@ SnapshotFiller.prototype._onJETSuccess = function (fields, serverResult) {
 */
 SnapshotFiller.prototype._onRTKSuccess = function (fields, serverResult) {
 	this._dispatch("adcDataReceived", serverResult);
-	var data2D = serverResult["rows"];
-	var svHeaders = serverResult["rows"] && serverResult["rows"][0];
+	let data2D = serverResult["rows"];
+	let svHeaders = serverResult["rows"] && serverResult["rows"][0];
 	if (!Array.isArray(data2D) || !Array.isArray(svHeaders)) {
 		return; //TODO: Return Promise.reject(errMsg);
 	}
@@ -16606,11 +16635,11 @@ SnapshotFiller.prototype._onRTKSuccess = function (fields, serverResult) {
 	// Server will return field only in UPPERCASE
 	// ex. requestField = TR.Volume ===> serverField = TR.VOLUME
 	// so we need convert UPPERCASE to be original
-	var i, field, ric;
-	var j = 1; //  to skip instrument index, use j = 1
-	var fLength = fields.length;
-	var hLength = svHeaders.length;
-	var headers = new Array(hLength);
+	let i, field, ric;
+	let j = 1; //  to skip instrument index, use j = 1
+	let fLength = fields.length;
+	let hLength = svHeaders.length;
+	let headers = new Array(hLength);
 	for (i = 0; i < fLength && j < hLength; i++) {
 		field = fields[i];
 		if (svHeaders[j].r.toUpperCase() === field.toUpperCase()) {
@@ -16619,23 +16648,23 @@ SnapshotFiller.prototype._onRTKSuccess = function (fields, serverResult) {
 		}
 	}
 
-	var len = data2D.length;
-	var fieldLen = headers.length;
-	var ricMap = {};
+	let len = data2D.length;
+	let fieldLen = headers.length;
+	let ricMap = {};
 
 	// TODO: Freeze the data view before setting multiple data
 	for (i = 1; i < len; i++) { // to skip column header index, use i = 1
-		var dataRow = data2D[i];
+		let dataRow = data2D[i];
 		ric = dataRow[0];
 
 		if (ricMap[ric]) {
 			continue; // we interested only first row of ric
 		}
-		var snapData = ricMap[ric] = {};
+		let snapData = ricMap[ric] = {};
 
 		// loop for create rowData for update
 		for (j = 1; j < fieldLen; j++) { // to skip instrument index, use j = 1
-			var value = dataRow[j];
+			let value = dataRow[j];
 			if (value != null && value !== "") {
 				if(typeof value !== 'object') {
 					field = headers[j];
@@ -16650,9 +16679,9 @@ SnapshotFiller.prototype._onRTKSuccess = function (fields, serverResult) {
 	}
 
 	// return result only ric that has update data
-	var updatedData = {};
+	let updatedData = {};
 	for (ric in ricMap) {
-		var obj = ricMap[ric];
+		let obj = ricMap[ric];
 		if (!isEmptyObject(obj)) {
 			updatedData[ric] = obj;
 		}
@@ -16673,45 +16702,45 @@ SnapshotFiller.prototype._onRTKTimeSeriesSuccess = function (fields, serverResul
 
 	// TODO: noti the user for change structure
 	this._dispatch("adcDataReceived", serverResult);
-	var data2D = serverResult["rows"];
-	var svHeaders = serverResult["rows"] && serverResult["rows"][0];
+	let data2D = serverResult["rows"];
+	let svHeaders = serverResult["rows"] && serverResult["rows"][0];
 	if (!Array.isArray(data2D) || !Array.isArray(svHeaders)) {
 		return; // TODO: Return Promise.reject(errMsg);
 	}
 	// Extract header dates
-	var headerDates = svHeaders.slice(2).map(header => header.v);
+	let headerDates = svHeaders.slice(2).map(header => header.v);
 	// Create necessary variables
-	var fileNameToTSField = {};
-	var count = 0;
+	let fileNameToTSField = {};
+	let count = 0;
 	// Convert map to fieldMap
-	var data2DLength = data2D.length;
-	for (var i = 1; i < data2DLength; i++) {
-		var dataRow = data2D[i];
-		var fieldName = dataRow[1];
+	let data2DLength = data2D.length;
+	for (let i = 1; i < data2DLength; i++) {
+		let dataRow = data2D[i];
+		let fieldName = dataRow[1];
 		if (!fileNameToTSField[fieldName]) {
 			fileNameToTSField[fieldName] = fields[count++];
 		}
 	}
 	// Process data and populate ricMap and childrenFieldToParent
-	var ricMap = {};
-	var childrenFieldToParent = {};
-	for (var i = 1; i < data2DLength; i++) {
-		var dataRow = data2D[i];
-		var ric = dataRow[0];
-		var fieldName = dataRow[1];
+	let ricMap = {};
+	let childrenFieldToParent = {};
+	for (let i = 1; i < data2DLength; i++) {
+		let dataRow = data2D[i];
+		let ric = dataRow[0];
+		let fieldName = dataRow[1];
 
 		if (!ricMap[ric]) {
 			ricMap[ric] = {};
 		}
-		var snapData = ricMap[ric];
+		let snapData = ricMap[ric];
 		if (headerDates.length === 1) {
 			// Time series with only 1 column, it will be a normal adc field
 			snapData[fileNameToTSField[fieldName]] = dataRow[2];
 		} else {
 			// Multiple columns, it will be a time series field
-			for (var k = 0; k < headerDates.length; k++) {
-				var field = fileNameToTSField[fieldName].replace("TR.", "") + "_" + headerDates[k];
-				var celLData =  dataRow[2 + k];
+			for (let k = 0; k < headerDates.length; k++) {
+				let field = fileNameToTSField[fieldName].replace("TR.", "") + "_" + headerDates[k];
+				let celLData =  dataRow[2 + k];
 				if(celLData !== null) {
 					childrenFieldToParent[field] = fileNameToTSField[fieldName];
 					snapData[field] = celLData;
@@ -16721,16 +16750,16 @@ SnapshotFiller.prototype._onRTKTimeSeriesSuccess = function (fields, serverResul
 	}
 
 	// Return result only for ric that has updated data
-	var dataMapping = {};
-	for (var ric in ricMap) {
-		var obj = ricMap[ric];
+	let dataMapping = {};
+	for (let ric in ricMap) {
+		let obj = ricMap[ric];
 		if (!isEmptyObject(obj)) {
 			dataMapping[ric] = obj;
 		}
 	}
 
 	// Dispatch events based on the header length
-	var eventData = {
+	let eventData = {
 		data: dataMapping,
 	};
 	if (headerDates.length > 1) {
@@ -30557,7 +30586,7 @@ DataView.prototype.getGroupRowId = function () {
 /**
 * @public
 * @ignore
-* @param {number} rid
+* @param {string} rid
 * @return {number}
 */
 DataView.prototype.getFooterRowIndex = function (rid) {
@@ -31092,6 +31121,17 @@ DataView.prototype.getExpansionParents = function (from, to) {
 	return parentMapping;
 };
 
+/**
+* @public
+* @param {string} rid
+* @return {string} parent row id
+*/
+DataView.prototype.getExpansionParentByRowId = function(rid) {
+	if(this._expansionChildren) {
+		return this._expansionChildren[rid] || "";
+	}
+	return "";
+};
 /** Check if the specified row is itself a row expansion.
 * @public
 * @param {string} rid rowId
@@ -31114,6 +31154,18 @@ DataView.prototype.hasRowExpansion = function(rid) {
 	}
 	return false;
 };
+/**
+* @public
+* @param {string} rowId
+* @return {number}
+*/
+DataView.prototype.getRowExpansionCount = function(rowId) {
+	if(this._expansionMap) {
+		return this._expansionMap[rowId] || 0;
+	}
+	return 0;
+};
+
 /** Get row Id of the row expansion by providing the row Id of the row with row expansion (not row expansion itself). This is NOT recommended for normal usage, since the row expansion contains no data in the DataView
 * @public
 * @param {string} rid rowId
@@ -36280,7 +36332,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.89";
+	return "5.1.92";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -38578,6 +38630,12 @@ Core.prototype.freezeSection = function (opt_frozenSection) {
 	this._fixFrozenTopSections = true;
 	this._freezeTopSectionAt(opt_frozenSection);
 };
+/** @public
+*/
+Core.prototype.resetSectionFreezing = function () {
+	this._fixFrozenTopSections = false;
+	this._updateFrozenTopSections();
+};
 
 /** Vertical scrollbar will automatically appear for the rest of the sections, when container of Grid does NOT have enough space for Grid's content.
 * @private
@@ -40587,25 +40645,35 @@ Core.prototype._dispatchRowExpansionBinding = function (e) {
 
 	var fromR = /** @type{number} */(e["fromRowIndex"]);
 	var toR = /** @type{number} */(e["toRowIndex"]);
-	var parents = dataView.getExpansionParents(fromR, toR);
 	var rids = dataView.getVisibleRowIds(true);
 	var section = /** @type{ILayoutGrid} */(e["section"]);
 
 	e["rowData"] = null;
 	e["cell"] = null;
-	for (var r = fromR; r < toR; ++r) {
-		var parentRid = parents[r];
+	var lastRowIndexChanged = false;
+	for (var r = toR - 1; r >= fromR; --r) {
+		var rowId = dataView.getRowId(r);
+		if(!lastRowIndexChanged) {
+			var reCount = dataView.getRowExpansionCount(rowId);
+			if(reCount > 0){
+				r = r + reCount + 1; // include parent row
+				lastRowIndexChanged = true;
+				continue;
+			}
+		}
+
 		var ctxRow = section.getContextRow(r);
-		if(parentRid) { // Previous row is the row with expansion
-			e["originalRowData"] = dataView.getRowData(parentRid);
-			e["originalRowId"] = parentRid;
+		var parentId = dataView.getExpansionParentByRowId(rowId);
+		if(parentId) { // dispatch to render row expansion
+			e["originalRowData"] = dataView.getRowData(parentId);
+			e["originalRowId"] = parentId;
 			e["rowExpansion"] = ctxRow["rowExpansion"] = true;
-		} else if(ctxRow["rowExpansion"]) {
+		} else if(ctxRow["rowExpansion"] ){ // dispose cases
 			e["originalRowData"] = null;
 			e["originalRowId"] = null;
 			e["rowExpansion"] = ctxRow["rowExpansion"] = false;
-		} else {
-			continue; // There is no need to dispatch the event for normal row
+		} else { // normal row no need to dispatch
+			continue;
 		}
 		e["rowId"] = rids[r];
 		e["rowIndex"] = r;
@@ -41674,7 +41742,7 @@ Core._proto = Core.prototype;
 /**
 * @constructor
 */
-var StyleLoader = {};
+let StyleLoader = {};
 
 /** @public
  * @type {string}
@@ -41717,7 +41785,7 @@ StyleLoader.applyStyle = function (grid) {
 // CONCATENATED MODULE: ./src/js/ReferenceCounter.js
 /** @constructor
 */
-var ReferenceCounter = function() {
+let ReferenceCounter = function() {
 	this._counter = {};
 	this._session = {};
 	this._referers = {};
@@ -41774,10 +41842,10 @@ ReferenceCounter.prototype.getAllReferrers = ReferenceCounter.prototype.getAllRe
 * @return {Object} Object with newEntries and removedEntries
 */
 ReferenceCounter.prototype.getSession = function() {
-	var newEntries = [];
-	var removedEntries = [];
-	for(var key in this._session) {
-		var val = this._session[key];
+	let newEntries = [];
+	let removedEntries = [];
+	for(let key in this._session) {
+		let val = this._session[key];
 		if(val > 0) {
 			newEntries.push(key);
 		} else if(val < 0) {
@@ -41799,7 +41867,7 @@ ReferenceCounter.prototype.getSession = function() {
 ReferenceCounter.prototype.addReference = function(key, referer) {
 	if(key) {
 		if(referer) {
-			var counter = this._referers[referer];
+			let counter = this._referers[referer];
 			if(counter) {
 				if(counter[key]) { // Single Referer can only add specific key only once
 					return false;
@@ -41843,7 +41911,7 @@ ReferenceCounter.prototype.removeReference = function(key, referer, count) {
 	if(!key) {
 		return false;
 	}
-	var val = this._counter[key];
+	let val = this._counter[key];
 	if(!val) {
 		return false;
 	}
@@ -41856,7 +41924,7 @@ ReferenceCounter.prototype.removeReference = function(key, referer, count) {
 	}
 
 	if(referer) {
-		var counter = this._referers[referer];
+		let counter = this._referers[referer];
 		if(!counter) {
 			return false;
 		}
@@ -41896,10 +41964,10 @@ ReferenceCounter.prototype.addReferences = function(keys, referer) {
 	if(!keys) {
 		return 0;
 	}
-	var count = 0;
+	let count = 0;
 	if(Array.isArray(keys)) {
-		var len = keys.length;
-		for(var i = 0; i < len; ++i) {
+		let len = keys.length;
+		for(let i = 0; i < len; ++i) {
 			if(this.addReference(keys[i], referer)) {
 				++count;
 			}
@@ -41909,7 +41977,7 @@ ReferenceCounter.prototype.addReferences = function(keys, referer) {
 			++count;
 		}
 	} else {
-		for(var key in keys) {
+		for(let key in keys) {
 			if(this.addReference(key, referer)) {
 				++count;
 			}
@@ -41924,11 +41992,11 @@ ReferenceCounter.prototype.addReferences = function(keys, referer) {
 * @return {number} Number of removed entries
 */
 ReferenceCounter.prototype.removeReferer = function(referer) {
-	var count = 0;
+	let count = 0;
 	if(referer) {
-		var counter = this._referers[referer];
+		let counter = this._referers[referer];
 		if(counter) {
-			for(var key in counter) {
+			for(let key in counter) {
 				if(this.removeReference(key, referer)) {
 					++count;
 				}
@@ -41969,8 +42037,8 @@ ReferenceCounter.prototype.log = function() {
 * @constructor
 * @extends {EventDispatcher}
 */
-var DataConnector = function () {
-	var t = this;
+let DataConnector = function () {
+	let t = this;
 	t._commitRicsChanges = t._commitRicsChanges.bind(this);
 	t._commitFieldsChanges = t._commitFieldsChanges.bind(this);
 	t._fieldChangedConflator = new Conflator(0, t._commitFieldsChanges);
@@ -42017,8 +42085,8 @@ DataConnector.prototype.getAllRics = function () {
  * @returns {Array.<RowDefinition>}
 */
 DataConnector.prototype.getAllRowDefs = function () {
-	var results = [];
-	for (var i in this._rowDefMap) { // TODO: Check if push is better than concat
+	let results = [];
+	for (let i in this._rowDefMap) { // TODO: Check if push is better than concat
 		results = results.concat(this._rowDefMap[i]);
 	}
 	return results;
@@ -42045,13 +42113,13 @@ DataConnector.prototype.getRowDefByRic = function (ric) {
 * @return {boolean} True if new reference is added.
 */
 DataConnector.prototype.addRic = function (rowDef) {
-	var ric = rowDef ? rowDef.getSymbol() : "";
+	let ric = rowDef ? rowDef.getSymbol() : "";
 	if(!ric) {
 		return false;
 	}
 
-	var rowDefMap = this._rowDefMap;
-	var rowDefs = rowDefMap[ric];
+	let rowDefMap = this._rowDefMap;
+	let rowDefs = rowDefMap[ric];
 	if (!rowDefs) {
 		rowDefs = rowDefMap[ric] = [rowDef];
 	} else {
@@ -42061,7 +42129,7 @@ DataConnector.prototype.addRic = function (rowDef) {
 	}
 
 	// Referer could be added, even if no new reference is added.
-	var newReference = this._rics.addReference(ric, rowDef.getRowId());
+	let newReference = this._rics.addReference(ric, rowDef.getRowId());
 
 	this._commitRicsChanges();
 	return newReference;
@@ -42080,10 +42148,10 @@ DataConnector.prototype.removeRic = function (rowDef, ric) {
 		return;
 	}
 
-	var rowDefMap = this._rowDefMap;
-	var rowDefs = rowDefMap[ric];
+	let rowDefMap = this._rowDefMap;
+	let rowDefs = rowDefMap[ric];
 	if (rowDefs) {
-		var index = rowDefs.indexOf(rowDef);
+		let index = rowDefs.indexOf(rowDef);
 		if (index >= 0) {
 			rowDefs.splice(index, 1);
 		}
@@ -42096,8 +42164,8 @@ DataConnector.prototype.removeRic = function (rowDef, ric) {
 /** @public
 */
 DataConnector.prototype.removeAllRics = function () {
-	var referers = this._rics.getAllReferers(); // TODO: Add method to removeAllReferers at once
-	for (var i in referers) {
+	let referers = this._rics.getAllReferers(); // TODO: Add method to removeAllReferers at once
+	for (let i in referers) {
 		this._rics.removeReferer(referers[i]);
 	}
 	this._rowDefMap = {};
@@ -42111,10 +42179,10 @@ DataConnector.prototype._commitRicsChanges = function () {
 		return;
 	}
 
-	var rics = this._rics;
-	var session = rics.getSession();
-	var removedEntries = session.removedEntries;
-	var newEntries = session.newEntries;
+	let rics = this._rics;
+	let session = rics.getSession();
+	let removedEntries = session.removedEntries;
+	let newEntries = session.newEntries;
 
 	if (removedEntries.length) {
 		this._doDispatch({
@@ -42139,7 +42207,7 @@ DataConnector.prototype._commitRicsChanges = function () {
 DataConnector.prototype.addFields = function (fieldRef, referer) {
 	if (!fieldRef) { return; }
 
-	var fields = this._fields;
+	let fields = this._fields;
 
 	if (fieldRef instanceof js_ColumnDefinition) {
 		fields.addReferences(fieldRef.getAllFields(), fieldRef.getId());
@@ -42175,8 +42243,8 @@ DataConnector.prototype.removeFieldReferrer = function (referrer) {
 /** @public
 */
 DataConnector.prototype.removeAllFields = function () {
-	var referers = this._fields.getAllReferers();
-	for (var i in referers) { // TODO: Add method to removeAllReferers at once
+	let referers = this._fields.getAllReferers();
+	for (let i in referers) { // TODO: Add method to removeAllReferers at once
 		this._fields.removeReferer(referers[i]);
 	}
 	this._commitFieldsChanges();
@@ -42189,10 +42257,10 @@ DataConnector.prototype._commitFieldsChanges = function () {
 		return;
 	}
 
-	var fields = this._fields;
-	var session = fields.getSession();
-	var removedEntries = session.removedEntries;
-	var newEntries = session.newEntries;
+	let fields = this._fields;
+	let session = fields.getSession();
+	let removedEntries = session.removedEntries;
+	let newEntries = session.newEntries;
 
 	if (removedEntries.length) {
 		this._doDispatch({
@@ -42213,7 +42281,7 @@ DataConnector.prototype._commitFieldsChanges = function () {
 * @param {Object} payload
 */
 DataConnector.prototype._doDispatch = function (payload) {
-	var t = this;
+	let t = this;
 	payload.fields = t.getAllFields();
 	payload.rics = t.getAllRics();
 	payload.rowDefs = t.getAllRowDefs();
@@ -42223,7 +42291,7 @@ DataConnector.prototype._doDispatch = function (payload) {
 /** @public
 */
 DataConnector.prototype.reset = function () {
-	var t = this;
+	let t = this;
 	t._rowDefMap = {};
 	t._fields.reset();
 	t._rics.reset();
@@ -42243,7 +42311,7 @@ DataConnector.prototype.reset = function () {
 * @param {number} order
 * @return {number}
 */
-var _defaultCompare = function(a, b, order) {
+let _defaultCompare = function(a, b, order) {
 	if(a == null || a !== a) {
 		if(b == null || b !== b) {
 			return 0;
@@ -42265,7 +42333,7 @@ var _defaultCompare = function(a, b, order) {
 
 /** @constructor
 */
-var RowDefSorter = function() {
+let RowDefSorter = function() {
 	this._defaultSorter = this._defaultSorter.bind(this);
 	this._dataSorter = this._dataSorter.bind(this);
 	this._rowDefSorter = this._rowDefSorter.bind(this);
@@ -42308,12 +42376,12 @@ RowDefSorter.prototype.dispose = function() {
 */
 RowDefSorter.prototype.getSorter = function() {
 	this._primaryParams = null;
-	var sortCount = this._sortParams.length;
+	let sortCount = this._sortParams.length;
 	if(sortCount === 1) {
-		var params = this._primaryParams = this._sortParams[0];
-		var sortLogic = params[1];
+		let params = this._primaryParams = this._sortParams[0];
+		let sortLogic = params[1];
 		if(sortLogic) {
-			var rowSorting = params[3];
+			let rowSorting = params[3];
 			return rowSorting ? this._rowDefSorter : this._dataSorter;
 		} else {
 			return this._defaultSorter;
@@ -42353,19 +42421,19 @@ RowDefSorter.prototype.addColumnContext = function(field, logic, rowSorting, ord
 	if(!field) {
 		field = "";
 	}
-	var sortPriority = this._sortParams.length;
-	var ctx = this._ctxCaches[sortPriority];
+	let sortPriority = this._sortParams.length;
+	let ctx = this._ctxCaches[sortPriority];
 	if(!ctx) {
 		ctx = this._ctxCaches[sortPriority] = cloneObject(this._globalContext);
 	}
-	var orderNum = 0;
+	let orderNum = 0;
 	if(order === "a") {
 		orderNum = 1;
 	} else if(order === "d") {
 		orderNum = -1;
 	}
 
-	var params = [
+	let params = [
 		field, // 0
 		(typeof logic === "function") ? logic : null,  // 1
 		ctx, // 2
@@ -42397,7 +42465,7 @@ RowDefSorter._noSorting = function(rowDefA, rowDefB, order) {
 * @return {number}
 */
 RowDefSorter.prototype._defaultSorter = function(rowDefA, rowDefB, order) {
-	var field = this._primaryParams[0];
+	let field = this._primaryParams[0];
 	return _defaultCompare(
 		rowDefA.getData(field),
 		rowDefB.getData(field),
@@ -42411,9 +42479,9 @@ RowDefSorter.prototype._defaultSorter = function(rowDefA, rowDefB, order) {
 * @return {number}
 */
 RowDefSorter.prototype._dataSorter = function(rowDefA, rowDefB, order) {
-	var params = this._primaryParams;
-	var field = params[0];
-	var sortLogic = params[1];
+	let params = this._primaryParams;
+	let field = params[0];
+	let sortLogic = params[1];
 	return sortLogic(
 		rowDefA.getData(field),
 		rowDefB.getData(field),
@@ -42428,8 +42496,8 @@ RowDefSorter.prototype._dataSorter = function(rowDefA, rowDefB, order) {
 * @return {number}
 */
 RowDefSorter.prototype._rowDefSorter = function(rowDefA, rowDefB, order) {
-	var params = this._primaryParams;
-	var sortLogic = params[1];
+	let params = this._primaryParams;
+	let sortLogic = params[1];
 	return sortLogic(rowDefA, rowDefB, order, params[2]);
 };
 /** @private
@@ -42439,16 +42507,16 @@ RowDefSorter.prototype._rowDefSorter = function(rowDefA, rowDefB, order) {
 * @return {number}
 */
 RowDefSorter.prototype._multiColumnsSorter = function(rowDefA, rowDefB, primaryOrder) {
-	var sortParams = this._sortParams;
-	var sortCount = sortParams.length;
-	for(var i = 0; i < sortCount; ++i) {
-		var params = sortParams[i];
-		var field = params[0];
-		var sortLogic = params[1];
-		var ctx = params[2];
-		var rowSorting = params[3];
-		var orderNum = params[4];
-		var ret = 0;
+	let sortParams = this._sortParams;
+	let sortCount = sortParams.length;
+	for(let i = 0; i < sortCount; ++i) {
+		let params = sortParams[i];
+		let field = params[0];
+		let sortLogic = params[1];
+		let ctx = params[2];
+		let rowSorting = params[3];
+		let orderNum = params[4];
+		let ret = 0;
 		if(sortLogic) {
 			if(rowSorting) {
 				ret = sortLogic(rowDefA, rowDefB, orderNum, ctx);
@@ -44586,13 +44654,13 @@ SortableTitlePlugin._proto = SortableTitlePlugin.prototype;
 * @private
 * @const
 */
-var SUB_ID = "SUB_ID";
+const SUB_ID = "SUB_ID";
 
 /** @private
 * @param {RowDefinition} rowDef
 * @return {Object}
 */
-var toRowData = function(rowDef) {
+let toRowData = function(rowDef) {
 	return rowDef ? rowDef.getRowData() : null;
 };
 
@@ -44600,7 +44668,7 @@ var toRowData = function(rowDef) {
 * @const
 * @type {Object.<string, number>}
 */
-var _unclonableFields = {
+let _unclonableFields = {
 	"ROW_DEF": 1,
 	"SUB_ID": 1
 };
@@ -44608,10 +44676,10 @@ var _unclonableFields = {
 * @param {RowDefinition} fromRowDef
 * @param {RowDefinition} toRowDef
 */
-var cloneRowData = function(fromRowDef, toRowDef) {
-	var from = toRowData(fromRowDef);
-	var to = toRowData(toRowDef);
-	for(var key in from) {
+let cloneRowData = function(fromRowDef, toRowDef) {
+	let from = toRowData(fromRowDef);
+	let to = toRowData(toRowDef);
+	for(let key in from) {
 		if(!_unclonableFields[key]) {
 			to[key] = from[key];
 		}
@@ -44622,7 +44690,7 @@ var cloneRowData = function(fromRowDef, toRowDef) {
 * @param {RowDefinition} rowDef
 * @return {boolean}
 */
-var excludeAutoGenerated = function (rowDef) {
+let excludeAutoGenerated = function (rowDef) {
 	return !rowDef.isAutoGenerated();
 };
 
@@ -44630,7 +44698,7 @@ var excludeAutoGenerated = function (rowDef) {
 * @param {Object} colConfig column config
 * @return {boolean}
 */
-var _byNonAutoGeneratedColumn = function (colConfig) {
+let _byNonAutoGeneratedColumn = function (colConfig) {
 	return !colConfig.autoGenerated;
 };
 /** @private
@@ -44640,7 +44708,7 @@ var _byNonAutoGeneratedColumn = function (colConfig) {
 * @param {string} fieldName
 * @return {number} The outcome of the value comparison
 */
-var compareNumber = function(rowDefA, rowDefB, sortOrder, fieldName) { // edit name
+let compareNumber = function(rowDefA, rowDefB, sortOrder, fieldName) { // edit name
 	return (rowDefA.getData(fieldName) - rowDefB.getData(fieldName)) * sortOrder; // for numeric comparison
 };
 
@@ -44651,14 +44719,14 @@ var compareNumber = function(rowDefA, rowDefB, sortOrder, fieldName) { // edit n
 * @param {string} sortOrder
 * @return {number} The outcome of the value comparison
 */
-var _sortChildrenOfChain =  function (rowDefA, rowDefB, sortOrder) {
-	var parentA = rowDefA.getParent();
+let _sortChildrenOfChain =  function (rowDefA, rowDefB, sortOrder) {
+	let parentA = rowDefA.getParent();
 
 	if (!parentA) {
 	  return 0;
 	}
 
-	var parentB = rowDefB.getParent();
+	let parentB = rowDefB.getParent();
 
 	if (!parentB) {
 	  return 0;
@@ -44668,13 +44736,13 @@ var _sortChildrenOfChain =  function (rowDefA, rowDefB, sortOrder) {
 	  return 0;
 	}
 
-	var a = rowDefA.getData('CHILD_ORDER');
+	let a = rowDefA.getData('CHILD_ORDER');
 
 	if (a == null) {
 	  return 0;
 	}
 
-	var b = rowDefB.getData('CHILD_ORDER');
+	let b = rowDefB.getData('CHILD_ORDER');
 
 	if (b == null) {
 	  return 0;
@@ -44687,7 +44755,7 @@ var _sortChildrenOfChain =  function (rowDefA, rowDefB, sortOrder) {
 * @param {ColumnDefinition} colDef
 * @return {string}
 */
-var _getName = function(colDef) {
+let _getName = function(colDef) {
 	if(colDef) {
 		return colDef.getName();
 	}
@@ -44698,7 +44766,7 @@ var _getName = function(colDef) {
 * @param {string} str
 * @return {boolean}
 */
-var _hasFieldOrId = function(colDef, str) {
+let _hasFieldOrId = function(colDef, str) {
 	return (colDef.getField() === str) || (colDef.getId() === str);
 };
 
@@ -44708,7 +44776,7 @@ var _hasFieldOrId = function(colDef, str) {
  * @param {Object} obj2
  * @returns {boolean} If the id property of two objects is equal, the return will be true, otherwise it will be false.
  */
-var _hasMatchingId = function(obj1, obj2) {
+let _hasMatchingId = function(obj1, obj2) {
 	if(!obj1 || !obj2 || !obj1.id || !obj2.id) { // Handle nullable, if the object or id have null, it's means difference value
 		return false;
 	}
@@ -44720,8 +44788,8 @@ var _hasMatchingId = function(obj1, obj2) {
 * @param {(Element|null)=} placeholder
 * @param {Grid~GridOptions=} config
 */
-var Grid = function(placeholder, config) {
-	var t = this; // This is to primarily reduce file size
+let Grid = function(placeholder, config) {
+	let t = this; // This is to primarily reduce file size
 
 	t._onDataChanged = t._onDataChanged.bind(t);
 	t._onQuote2PostUpdate = t._onQuote2PostUpdate.bind(t);
@@ -44779,7 +44847,7 @@ var Grid = function(placeholder, config) {
 			t._dt = t._dv.getDataTable();
 			t._mainGrid = config["grid"];
 
-			var core = t._mainGrid.getCoreGrid();
+			let core = t._mainGrid.getCoreGrid();
 			t._stp = core.getPlugin("SortableTitlePlugin");
 		}
 		if(config["SortableTitle"]) { // Exception for built-in plugin
@@ -44846,7 +44914,6 @@ var Grid = function(placeholder, config) {
 	t._connector.addEventListener("fieldRemoved", t._onFieldRemoved.bind(t));
 
 	t.initialize(config);
-	t.initSubscription();
 
 	js_StyleLoader.applyStyle(t._grid);
 };
@@ -45074,7 +45141,7 @@ Grid.prototype.initSubscription = function() {
 		return;
 	}
 
-	var jet, q, s;
+	let jet, q, s;
 	jet = window["JET"]; // Assume that JET is already exist.
 	if (this._RTK) {
 		q = this._RTK.Quotes;
@@ -45098,10 +45165,10 @@ Grid.prototype.initSubscription = function() {
 
 	// TODO: Subscriptions should be registered per row.
 	// However, chain subscription cannot be integrated with DataConnector in this current implementation.
-	var rowDefs = this._getAllRowDefinitions();
-	var len = rowDefs.length;
-	for(var i = 0; i < len; ++i) {
-		var rowDef = rowDefs[i];
+	let rowDefs = this._getAllRowDefinitions();
+	let len = rowDefs.length;
+	for(let i = 0; i < len; ++i) {
+		let rowDef = rowDefs[i];
 		if(rowDef) {
 			rowDef.subscribeForUpdates();
 		}
@@ -45120,7 +45187,7 @@ Grid.prototype.updateLayout = function() {
 */
 Grid.prototype._updateRowData = function(rowIndex) {
 	if(rowIndex >= 0) {
-		var rowId = this._dv.getRowId(rowIndex);
+		let rowId = this._dv.getRowId(rowIndex);
 		if(rowId) {
 			this._dt.setRowData(rowId, {});
 		}
@@ -45137,7 +45204,7 @@ Grid.prototype.updateRowData = Grid.prototype._updateRowData;
 /** @private
  */
 Grid.prototype._addGridSections = function () {
-	var title = this._grid.addSection("title");
+	let title = this._grid.addSection("title");
 	if(this._topSection == false){
 		title.setRowCount(0);
 	} else {
@@ -45145,10 +45212,10 @@ Grid.prototype._addGridSections = function () {
 	}
 	this._grid.addSection("content");
 
-	var titleSettings = this._grid.getSectionSettings("title");
+	let titleSettings = this._grid.getSectionSettings("title");
 	titleSettings.disableDataBinding();
 
-	var contentSettings = this._grid.getSectionSettings("content");
+	let contentSettings = this._grid.getSectionSettings("content");
 	contentSettings.setAutoSyncRowCount(true);
 	contentSettings.setParent(titleSettings);
 };
@@ -45157,13 +45224,13 @@ Grid.prototype._addGridSections = function () {
 * @return {*} Return Section instance
  */
 Grid.prototype.addHeaderSection = function (sectionName) {
-	var titleSects = this._grid.getAllSections("title");
+	let titleSects = this._grid.getAllSections("title");
 
-	var headerSect = this._grid.addSectionAt(titleSects.length, "title", sectionName);
+	let headerSect = this._grid.addSectionAt(titleSects.length, "title", sectionName);
 	if(headerSect) {
 		headerSect.setRowCount(1);
 
-		var headerSettings = this._grid.getSectionSettings(headerSect);
+		let headerSettings = this._grid.getSectionSettings(headerSect);
 		headerSettings.disableDataBinding();
 	}
 
@@ -45174,11 +45241,11 @@ Grid.prototype.addHeaderSection = function (sectionName) {
 * @return {*} Return Section instance
 */
 Grid.prototype.addFooterSection = function (sectionName) {
-	var footerSect = this._grid.addSection("footer", sectionName);
+	let footerSect = this._grid.addSection("footer", sectionName);
 	if(footerSect) {
 		footerSect.setRowCount(1);
 
-		var footerSettings = this._grid.getSectionSettings(footerSect);
+		let footerSettings = this._grid.getSectionSettings(footerSect);
 		footerSettings.disableDataBinding();
 	}
 
@@ -45197,7 +45264,7 @@ Grid.prototype.setParent = function (elem) {
 */
 Grid.prototype.insertBefore = function (elem) {
 	if(elem) {
-		var pn = elem.parentNode;
+		let pn = elem.parentNode;
 		if(pn) {
 			pn.insertBefore(this._topNode, elem);
 			this.updateLayout();
@@ -45231,17 +45298,20 @@ Grid.prototype.getCoreGrid = function () {
 * @param {Grid~GridOptions=} gridOption
 */
 Grid.prototype.initialize = function(gridOption) {
-	if (!gridOption) { return; }
+	if (!gridOption) {
+		this.initSubscription();
+		return;
+	}
 	// TODO: clear all data before re-initialization
-	var t = this; // For minimizing file size
+	let t = this; // For minimizing file size
 	t._initializing = true;
-	var grid = t._grid; // core grid
+	let grid = t._grid; // core grid
 	grid.resetInternalState();
 	gridOption = grid.normalizeConfig(gridOption);
 
-	var exts = gridOption["plugins"] || gridOption["extensions"];
+	let exts = gridOption["plugins"] || gridOption["extensions"];
 
-	var cols = /** @type{Array} */(gridOption["fields"] || gridOption["columns"]);
+	let cols = /** @type{Array} */(gridOption["fields"] || gridOption["columns"]);
 	if (gridOption["defaultColumnOptions"]) {
 		t._defaultColumnOptions = gridOption["defaultColumnOptions"];
 		t._defaultColumnSetup(t._defaultColumnOptions, cols);
@@ -45291,23 +45361,23 @@ Grid.prototype.initialize = function(gridOption) {
 		t._fnEngine.addEventListener("dataRequired", t._onFormulaDataRequired);
 	}
 
-	var borders = gridOption["borders"];
+	let borders = gridOption["borders"];
 	if (borders != null) {
 		grid.toggleBorders(borders);
 	}
-	var gridlines = gridOption["gridlines"];
+	let gridlines = gridOption["gridlines"];
 	if (gridlines != null) {
 		grid.toggleGridlines(gridlines);
 	}
-	var vLines = gridOption["verticalLines"];
+	let vLines = gridOption["verticalLines"];
 	if (vLines != null) {
 		grid.toggleVerticalLines(vLines);
 	}
-	var cvLines = gridOption["contentVerticalLines"];
+	let cvLines = gridOption["contentVerticalLines"];
 	if (cvLines != null) {
 		grid.toggleContentVerticalLines(cvLines);
 	}
-	var hLines = gridOption["horizontalLines"];
+	let hLines = gridOption["horizontalLines"];
 	if (hLines != null) {
 		grid.toggleHorizontalLines(hLines);
 	}
@@ -45316,28 +45386,28 @@ Grid.prototype.initialize = function(gridOption) {
 		t._dv.setPageSize(+gridOption["pageSize"]);
 	}
 
-	var rowHeight = +gridOption["rowHeight"];
+	let rowHeight = +gridOption["rowHeight"];
 	if(rowHeight) { // Non empty or zero
 		grid.setDefaultRowHeight(rowHeight);
 	}
-	var hRowHeight = +gridOption["headerRowHeight"];
+	let hRowHeight = +gridOption["headerRowHeight"];
 	if(hRowHeight) { // Non empty or zero
 		grid.getSection("title").setDefaultRowHeight(hRowHeight);
 	}
 
-	var val = gridOption["autoLayoutUpdate"];
+	let val = gridOption["autoLayoutUpdate"];
 	if(!t._autoLayoutTimer && val) {
 		if(val !== "0" && val !== "false") { // HACK: Temporarily support incorrect data type
 			t._autoLayoutTimer = setInterval(t._onAutoLayoutUpdate.bind(t), 2000);
 		}
 	}
 
-	var bool = gridOption["rowHighlighting"];
+	let bool = gridOption["rowHighlighting"];
 	if(bool != null) {
 		grid.enableRowHighlighting(!!bool);
 	}
 
-	var rowExpansionBinding = gridOption["rowExpansionBinding"];
+	let rowExpansionBinding = gridOption["rowExpansionBinding"];
 	if(typeof rowExpansionBinding === "function") {
 		grid.listen("rowExpansionBinding", t._onRowExpansionBinding); // TODO: Support multi-table feature
 		t.listen("rowExpansionBinding", rowExpansionBinding);
@@ -45364,7 +45434,7 @@ Grid.prototype.initialize = function(gridOption) {
 	if(gridOption["scrollbarParent"] != null) {
 		t._setScrollbarParent(gridOption["scrollbarParent"]);
 	}
-	var pollingInterval = gridOption["adcPollingInterval"];
+	let pollingInterval = gridOption["adcPollingInterval"];
 	if(pollingInterval != null) {
 		t._pollingInterval = pollingInterval ? +pollingInterval : 0;
 	}
@@ -45372,7 +45442,7 @@ Grid.prototype.initialize = function(gridOption) {
 	// Column operations
 	t.setColumns(cols);
 
-	var rowVir = true;
+	let rowVir = true;
 	if (gridOption["rowVirtualRendering"] != null) {
 		rowVir = gridOption["rowVirtualRendering"];
 	}
@@ -45381,7 +45451,7 @@ Grid.prototype.initialize = function(gridOption) {
 	}
 	grid.enableRowVirtualization(!!rowVir);
 
-	var colVir = false;
+	let colVir = false;
 	if (gridOption["columnVirtualRendering"] != null) {
 		colVir = gridOption["columnVirtualRendering"];
 	}
@@ -45390,7 +45460,7 @@ Grid.prototype.initialize = function(gridOption) {
 	}
 	grid.enableColumnVirtualization(!!colVir);
 
-	var scrollbar = gridOption["scrollbar"] != null ? gridOption["scrollbar"] : true;
+	let scrollbar = gridOption["scrollbar"] != null ? gridOption["scrollbar"] : true;
 	if (scrollbar) {
 		t._topNode.style.overflow = "hidden"; // TODO: Move this to CSS Class
 	} else {
@@ -45398,16 +45468,16 @@ Grid.prototype.initialize = function(gridOption) {
 		t._topNode.style.overflow = "";
 	}
 
-	var topFreezingCount = gridOption["topFreezingCount"];
+	let topFreezingCount = gridOption["topFreezingCount"];
 	if (typeof topFreezingCount === "number") {
 		topFreezingCount = (topFreezingCount > 0) ? topFreezingCount : 0;
-		var sectionIndex = topFreezingCount - 1;
+		let sectionIndex = topFreezingCount - 1;
 		grid.freezeSection(sectionIndex);
 	} else if (topFreezingCount === false) {
 		grid.freezeSection(null);
 	}
 
-	var bottomFreezingCount = gridOption["bottomFreezingCount"];
+	let bottomFreezingCount = gridOption["bottomFreezingCount"];
 	if (typeof bottomFreezingCount === "number") {
 		bottomFreezingCount = (bottomFreezingCount > 0) ? bottomFreezingCount : 0;
 		grid.freezeFooter(bottomFreezingCount);
@@ -45418,11 +45488,11 @@ Grid.prototype.initialize = function(gridOption) {
 	// Plugins
 	gridOption[ROW_DEF] = true; // Enable ROW_DEF mode
 	if (Array.isArray(exts)) {
-		for (var i = 0; i < exts.length; ++i) {
-			var ext = exts[i];
-			var extInstance = null;
+		for (let i = 0; i < exts.length; ++i) {
+			let ext = exts[i];
+			let extInstance = null;
 			if (ext) {
-				var extName = ext["name"];
+				let extName = ext["name"];
 				if(extName) {
 					extInstance = grid.loadPlugin(extName, ext); // pass plugin object as an argument for initialization
 				} else {
@@ -45430,7 +45500,7 @@ Grid.prototype.initialize = function(gridOption) {
 				}
 			}
 			if (extInstance && extInstance["setGridWrapper"]) {
-				var hasApi = (typeof extInstance["getGridApi"] === "function") ? extInstance["getGridApi"]() : false;
+				let hasApi = (typeof extInstance["getGridApi"] === "function") ? extInstance["getGridApi"]() : false;
 				if(!hasApi) {
 					extInstance["setGridWrapper"]("realTimeGrid", t);
 				}
@@ -45439,7 +45509,7 @@ Grid.prototype.initialize = function(gridOption) {
 		t._initializing = false;
 	}
 
-	var lang = gridOption["lang"];
+	let lang = gridOption["lang"];
 	if(lang != null) {
 		t._lang = lang;
 		t._dateTimeUtil.setLocale(lang);
@@ -45449,18 +45519,18 @@ Grid.prototype.initialize = function(gridOption) {
 	if(gridOption["childDataField"] != null) {
 		this._childDataField = RowDefinition._childDataField = gridOption["childDataField"];
 	}
-	var rows = gridOption["rows"];
+	let rows = gridOption["rows"];
 	if(!rows) {
 		rows = gridOption["rics"] || null; // Make "rics" an alias to "rows"
 	}
-	var bodies = /** @type{Array} */(gridOption["bodies"]);
+	let bodies = /** @type{Array} */(gridOption["bodies"]);
 	if(!bodies) {
 		bodies = [];
 		if(gridOption["body"]) {
 			bodies.push(gridOption["body"]);
 		}
 		if(rows) {
-			for(var m = 0; m < rows.length; m++) {
+			for(let m = 0; m < rows.length; m++) {
 				if(typeof rows[m] === "string") {
 					rows[m] = { "ric": rows[m] };
 				}
@@ -45470,13 +45540,13 @@ Grid.prototype.initialize = function(gridOption) {
 	}
 
 	// Merge rows with static data rows
-	var staticRows = gridOption["staticDataRows"] || gridOption["dataModel"];
+	let staticRows = gridOption["staticDataRows"] || gridOption["dataModel"];
 	if(rows && staticRows) {
-		var ary = staticRows["data"] ? staticRows["data"] : staticRows;
-		var fields = staticRows["fields"] || t.getColumnFields();
-		var values, data;
-		var len = rows.length;
-		for(var n = 0; n < len; n++) {
+		let ary = staticRows["data"] ? staticRows["data"] : staticRows;
+		let fields = staticRows["fields"] || t.getColumnFields();
+		let values, data;
+		let len = rows.length;
+		for(let n = 0; n < len; n++) {
 			if(rows[n]["values"]) { // merge row's values, values can be object or array
 				values = arrayToObject(rows[n]["values"], fields);
 				data = arrayToObject(ary[n], fields);
@@ -45493,7 +45563,7 @@ Grid.prototype.initialize = function(gridOption) {
 		}
 	}
 
-	for(var j = 0; j < bodies.length; ++j) {
+	for(let j = 0; j < bodies.length; ++j) {
 		t.insertRows(bodies[j]["rows"]);
 		// break; // TODO: The first version supports only 1 grid
 	}
@@ -45504,7 +45574,7 @@ Grid.prototype.initialize = function(gridOption) {
 		grid.setBottomPaddingSection(gridOption.contentBottomPadding);
 	}
 
-	var contentRightPadding = gridOption.contentRightPadding;
+	let contentRightPadding = gridOption.contentRightPadding;
 	if(contentRightPadding) {
 		if (typeof contentRightPadding !== "number") {
 			contentRightPadding = 6;
@@ -45515,14 +45585,15 @@ Grid.prototype.initialize = function(gridOption) {
 
 	// Let everything init first
 	// then set conflationRate to grid for better perfomance on rapidly updating
-	var dataConflationRate = gridOption['dataConflationRate'];
+	let dataConflationRate = gridOption['dataConflationRate'];
 	if (dataConflationRate != null) {
 		grid.setDataConflationRate(dataConflationRate);
 	}
 
 	// Tell all plugins that the initialization phase has ended
-	var extObjects = grid.getPluginList().map(grid.getPlugin.bind(grid));
+	let extObjects = grid.getPluginList().map(grid.getPlugin.bind(grid));
 	t._processExtension(extObjects, "afterInit");
+	t.initSubscription();
 };
 
 /** @public
@@ -45530,14 +45601,14 @@ Grid.prototype.initialize = function(gridOption) {
 * @return {!Object}
 */
 Grid.prototype.getConfigObject = function (gridOptions) {
-	var obj = gridOptions || {};
+	let obj = gridOptions || {};
 
-	var columns = obj.columns;
+	let columns = obj.columns;
 	if(!columns) {
 		columns = obj.columns = [];
 	}
 
-	var grid = this._grid;
+	let grid = this._grid;
 	if(grid.getConfigObject) {
 		grid.getConfigObject(obj);
 	}
@@ -45564,17 +45635,17 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 	}
 
 
-	var i, len, prevTimeSeriesField;
+	let i, len, prevTimeSeriesField;
 	len = this.getColumnCount();
 	for (i = 0; i < len; ++i) {
-		var column = columns[i];
+		let column = columns[i];
 		if(!column) {
 			column = columns[i] = {};
 		}
-		var colDef = this.getColumnDefinition(i);
+		let colDef = this.getColumnDefinition(i);
 		// TODO: Update width and scalability changed by the extensions
 		colDef.getConfigObject(column);
-		var parentField = js_FieldDefinition.getFieldProperty(colDef.getField(), "timeSeriesParent");
+		let parentField = js_FieldDefinition.getFieldProperty(colDef.getField(), "timeSeriesParent");
 		if(parentField && !prevTimeSeriesField) { // Assume first column of time series child to convert to time series parent
 			prevTimeSeriesField = parentField;
 			column.field = parentField;
@@ -45592,7 +45663,7 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 		obj["scrollbar"] = false;
 	}
 
-	var val = this._dv.getPageSize();
+	let val = this._dv.getPageSize();
 	if(val > 0) {
 		obj["pageSize"] = val;
 	}
@@ -45645,9 +45716,9 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 	}
 
 	// get all rows config
-	var rowDefs = this.getAllRowDefinitions();
-	var rows = obj["rows"] = [];
-	var rowDef, rowConfig;
+	let rowDefs = this.getAllRowDefinitions();
+	let rows = obj["rows"] = [];
+	let rowDef, rowConfig;
 	len = rowDefs.length;
 	for (i = 0; i < len; i++) {
 		rowDef = rowDefs[i];
@@ -45656,9 +45727,9 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 	}
 
 	// get row config from extensions
-	var extensions = grid.getPlugins();
-	var pluginInstance, row;
-	for(var key in extensions) {
+	let extensions = grid.getPlugins();
+	let pluginInstance, row;
+	for(let key in extensions) {
 		pluginInstance = extensions[key];
 		if(typeof pluginInstance["getRowConfigObject"] === "function") {
 			len = rows.length;
@@ -45710,11 +45781,11 @@ Grid.prototype.setLocale = function(lang) {
 * @param {Array.<Object>} userColumns
 */
 Grid.prototype._defaultColumnSetup = function (defaultCol, userColumns) {
-	var c = userColumns.length;
-	for (var i = 0; i < c; i++) {
-		var column = userColumns[i];
+	let c = userColumns.length;
+	for (let i = 0; i < c; i++) {
+		let column = userColumns[i];
 		if (typeof column === 'object') {
-			for (var key in defaultCol) {
+			for (let key in defaultCol) {
 				if (column[key] == null) {
 					column[key] = defaultCol[key];
 				}
@@ -45732,7 +45803,7 @@ Grid.prototype._defaultColumnSetup = function (defaultCol, userColumns) {
 */
 Grid.prototype._processExtension = function (exts, field, params) {
 	if(Array.isArray(exts)) {
-		for (var i = 0; i < exts.length; i++) {
+		for (let i = 0; i < exts.length; i++) {
 			if (exts[i][field]) {
 				exts[i][field].apply(exts[i], params);
 			}
@@ -45744,15 +45815,15 @@ Grid.prototype._processExtension = function (exts, field, params) {
 * @param {Object} e
 */
 Grid.prototype._onRicAdded = function(e) {
-	var addedRics = e.addedRics;
+	let addedRics = e.addedRics;
 	this._snapshot.addFields(e.fields);
-	var len = addedRics.length;
-	for (var i = 0; i < len; ++i) {
-		var ric = addedRics[i];
-		var rowDefs = this._connector.getRowDefByRic(ric);
-		var jLen = rowDefs ? rowDefs.length : 0;
-		for (var j = 0; j < jLen; ++j) {
-			var rowDef = rowDefs[j];
+	let len = addedRics.length;
+	for (let i = 0; i < len; ++i) {
+		let ric = addedRics[i];
+		let rowDefs = this._connector.getRowDefByRic(ric);
+		let jLen = rowDefs ? rowDefs.length : 0;
+		for (let j = 0; j < jLen; ++j) {
+			let rowDef = rowDefs[j];
 			if (rowDef.getSymbol() === ric) {
 				this._snapshot.addRic(ric); // ADC
 			}
@@ -45773,18 +45844,18 @@ Grid.prototype._onRicRemoved = function(e) {
 * @param {Object} e
 */
 Grid.prototype._onFieldAdded = function(e) {
-	var rowDefs = e.rowDefs;
-	var addedFields = e.addedFields;
+	let rowDefs = e.rowDefs;
+	let addedFields = e.addedFields;
 
 	// ADC
-	for (var i in rowDefs) {
+	for (let i in rowDefs) {
 		this._snapshot.addRic(rowDefs[i].getSymbol());
 	}
 	this._snapshot.addFields(addedFields);
 
 	// JET
 	if (this._subs) {
-		var realtimeFields = addedFields.filter(js_FieldDefinition.isRealTimeField);
+		let realtimeFields = addedFields.filter(js_FieldDefinition.isRealTimeField);
 		if(realtimeFields.length > 0) {
 			this._subs["addFields"](realtimeFields);
 		}
@@ -45796,7 +45867,7 @@ Grid.prototype._onFieldAdded = function(e) {
 * @param {Object} e
 */
 Grid.prototype._onFieldRemoved = function(e) {
-	var removedFields = e.removedFields;
+	let removedFields = e.removedFields;
 
 	// TODO: ADC fields have an interval load. Currently, we only keep the field but do not delete it.
 	// JET
@@ -45812,19 +45883,19 @@ Grid.prototype._onFieldRemoved = function(e) {
 * @param {number=} idx
 */
 Grid.prototype.insertColumn = function (columnOption, idx) {
-	var colCount = this.getColumnCount();
+	let colCount = this.getColumnCount();
 	if(idx == null || idx > colCount) {
 		idx = colCount;
 	}
 
 	// no need to merge defaultColumn during initialize process
 	// because columnOption already mutate by initialize function
-	var configObj = (this._initializing) ? {} : cloneObject(this._defaultColumnOptions);
+	let configObj = (this._initializing) ? {} : cloneObject(this._defaultColumnOptions);
 
 	if (typeof columnOption === "string") {
 		configObj["field"] = columnOption;
 	} else { // columnOption is assumed to be an object
-		for (var key in columnOption) {
+		for (let key in columnOption) {
 			configObj[key] = columnOption[key];
 		}
 	}
@@ -45833,7 +45904,7 @@ Grid.prototype.insertColumn = function (columnOption, idx) {
 		configObj["formulaEngine"] = this._fnEngine; // Adding extra option
 	}
 
-	var colDef = new ColumnDefinition(configObj, this);
+	let colDef = new ColumnDefinition(configObj, this);
 	configObj[COL_DEF] = colDef;
 
 	// WARNING: width is processed twice by tr-grid and rt-grid
@@ -45846,18 +45917,18 @@ Grid.prototype.insertColumn = function (columnOption, idx) {
 * @param {Object} e snapshort change event object
 */
 Grid.prototype._updateTimeSeriesFields = function (e) {
-	var childField;
-	var snapShotData = e.data;
-	var childFields = {};
-	for (var ric in snapShotData) {
+	let childField;
+	let snapShotData = e.data;
+	let childFields = {};
+	for (let ric in snapShotData) {
 		// childFields = snapShotData[ric];
 		for (childField in snapShotData[ric]) {
 			childFields[childField] = true; // Merge child fields to parent (Don't truth each ric it will be have some empty data)
 		}
 		this.setRicData(ric, snapShotData[ric]); // update cell data if exist
 	}
-	var parentField, field, colIndex, parentColDef, childColIndex;
-	var parentMap = {}; // map parent time series field and their first child
+	let parentField, field, colIndex, parentColDef, childColIndex;
+	let parentMap = {}; // map parent time series field and their first child
 	for (field in childFields) { // Warning: data change can be differ time series child field
 		parentField = e.childrenFieldToParent[field];
 		if(!parentMap[parentField]) {
@@ -45868,10 +45939,10 @@ Grid.prototype._updateTimeSeriesFields = function (e) {
 	}
 
 	for (parentField in parentMap) { // WARNING: one dataChanged event can be multiple fields
-		var childrenField = parentMap[parentField];
+		let childrenField = parentMap[parentField];
 		colIndex = this.getColumnIndex(parentField);
 		parentColDef = this._getColumnDefinition(colIndex);
-		var i, len;
+		let i, len;
 		len = childrenField.length;
 		for (i = 0; i < len; i++) {
 			childField = childrenField[i];
@@ -45897,8 +45968,8 @@ Grid.prototype._populateTimeSeriesChildren = function (colDef) {
 		return;
 	}
 
-	var colDefs  = this._timeSeriesChildConflator.popAllData();
-	var i, j, len, childField, idx;
+	let colDefs  = this._timeSeriesChildConflator.popAllData();
+	let i, j, len, childField, idx;
 
 	for (i = 0; i < colDefs.length; i++) {
 		colDef = colDefs[i];
@@ -45907,8 +45978,8 @@ Grid.prototype._populateTimeSeriesChildren = function (colDef) {
 		if(!colDef) {
 			continue;
 		}
-		var parentField = colDef.getField();
-		var childFields = js_FieldDefinition.getTimeSeriesChildren(parentField);
+		let parentField = colDef.getField();
+		let childFields = js_FieldDefinition.getTimeSeriesChildren(parentField);
 		if(!childFields) { // not found time series field
 			return;
 		}
@@ -45933,7 +46004,7 @@ Grid.prototype._populateTimeSeriesChildren = function (colDef) {
 * @param {number} idx index of insertion column
 */
 Grid.prototype._cloneTimeSeriesColumn = function (parentColDef, childField, idx) {
-	var parentConfig, columnOption;
+	let parentConfig, columnOption;
 	parentConfig = parentColDef.getConfigObject();
 	columnOption = cloneObject(parentConfig);
 	columnOption["field"] = childField.replace("TR.", ""); // We need to remove the 'TR' prefix from the field to avoid confusion with time series fields.
@@ -45950,15 +46021,15 @@ Grid.prototype._cloneTimeSeriesColumn = function (parentColDef, childField, idx)
 * @param {Grid~ColumnReference} colRef
 */
 Grid.prototype.replaceColumn = function (columnOption, colRef) {
-	var colIndex = this.getColumnIndex(colRef);
+	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) {
 		return;
 	}
-	var colConfig = {};
-	var core = this._grid;
-	var columnDef = core._getColumnDef(colIndex);
+	let colConfig = {};
+	let core = this._grid;
+	let columnDef = core._getColumnDef(colIndex);
 
-	var value = core.getColumnScalability(colIndex);
+	let value = core.getColumnScalability(colIndex);
 	colConfig["scalable"] = value;
 
 	value = core.getColumnCustomLaneSize(colIndex);
@@ -45992,7 +46063,7 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
 	if(typeof columnOption === "string") {
 		colConfig["field"] = columnOption;
 	} else { // type object from user
-		for (var key in columnOption) {
+		for (let key in columnOption) {
 			colConfig[key] = columnOption[key];
 		}
 	}
@@ -46005,7 +46076,7 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
 		colConfig["width"] = 1;
 	}
 
-	var colDef = this.getColumnDefinition(colIndex);
+	let colDef = this.getColumnDefinition(colIndex);
 	if(colDef && colConfig.id == null) {
 		colConfig.id =  colDef.getId(); // retain ID
 	}
@@ -46023,7 +46094,7 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
  */
 Grid.prototype._onFieldLoadedSuccess = function (field, colDef, response) {
 	if (response && response.id) {
-		var fieldDef = response;
+		let fieldDef = response;
 		if (colDef && colDef.getField() === field) {
 			if (colDef.isDefaultName() && fieldDef.name) {
 				colDef.setName(fieldDef.name);
@@ -46049,7 +46120,7 @@ Grid.prototype._onFieldLoadedError = function (err) {
 Grid.prototype._onFieldLoaded = function (field, referrer) {
 	// For time series, we need to wait until the field is loadedm, then we can insert a child from the field data.
 	if(js_FieldDefinition.isTimeSeries(field)) {
-		var colDef = this.getColumnDefinitionById(referrer); // The 'referrer' is a column ID that was just added
+		let colDef = this.getColumnDefinitionById(referrer); // The 'referrer' is a column ID that was just added
 		this._populateTimeSeriesChildren(colDef);
 	}
 	this._connector.addFields(field, referrer);
@@ -46086,14 +46157,14 @@ Grid.prototype.getFieldInfo = function(field) {
 * @param {string} field
 * @return {Promise}
 * @example
-* var gridConfig = {
+* let gridConfig = {
 *   synapse: { // define synapse configuration
 *     apiKey: "xxx",
 *     contextApp: "xxx",
 *     auth: "xxx" (optional)
 *   }
 * };
-* var promise = grid.loadFieldInfo("CF_LAST");
+* let promise = grid.loadFieldInfo("CF_LAST");
 */
 Grid.prototype.loadFieldInfo = function(field) {
 	return js_FieldDefinition.loadFieldInfo(field);
@@ -46106,7 +46177,7 @@ Grid.prototype.loadFieldInfo = function(field) {
 */
 Grid.prototype._shouldLoadFieldInfo = function (field) {
 
-	var val = this._RTK || window["JET"]; // Fastest checking can be performed by checking the first condition.
+	let val = this._RTK || window["JET"]; // Fastest checking can be performed by checking the first condition.
 	if(!val) {
 		return false;
 	}
@@ -46133,17 +46204,17 @@ Grid.prototype._shouldLoadFieldInfo = function (field) {
 * @param {Array.<Object>} columns Array of column options
 */
 Grid.prototype.setColumns = function(columns) {
-	var grid = this._grid;
-	var colCount = (columns) ? columns.length : 0;
+	let grid = this._grid;
+	let colCount = (columns) ? columns.length : 0;
 
 	grid.startBatch("reset");
 	this.removeAllColumns();
 	if(colCount > 0) {
-		var prevState = false;
+		let prevState = false;
 		if(colCount > 1) {
 			prevState = grid.freezeLayout(true); // Insert multiple columns can be a huge time consuming
 		}
-		for(var i = 0; i < colCount; ++i) {
+		for(let i = 0; i < colCount; ++i) {
 			this.insertColumn(columns[i], i);
 		}
 		if(colCount > 1) {
@@ -46160,20 +46231,20 @@ Grid.prototype.setColumns = function(columns) {
 * @param {boolean=} byId=false, if enable it, this method will only check for differences in the 'id' property
 */
 Grid.prototype.restoreColumns = function(columns, byId) {
-	var grid = this._grid;
+	let grid = this._grid;
 	grid.startBatch("reset");
-	var configObj = this.getConfigObject();
-	var previousColumns = configObj.columns;
+	let configObj = this.getConfigObject();
+	let previousColumns = configObj.columns;
 
-	var preColLen = previousColumns.length;
-	var newColLen = columns.length;
+	let preColLen = previousColumns.length;
+	let newColLen = columns.length;
 
-	var compareLogic = byId ? _hasMatchingId : deepEqual;
-	var removingFields = [];
-	var keepingColumns = [];
-	var columnOrdering = [];
+	let compareLogic = byId ? _hasMatchingId : deepEqual;
+	let removingFields = [];
+	let keepingColumns = [];
+	let columnOrdering = [];
 
-	var i, j, found;
+	let i, j, found;
 	// Slow, time complexity BigO(n ^ 2)
 	for (i = 0; i < preColLen; i++) {
 		found = false;
@@ -46191,8 +46262,8 @@ Grid.prototype.restoreColumns = function(columns, byId) {
 
 	this.removeColumns(removingFields);
 
-	var keepingLen = keepingColumns.length;
-	var prevState = false;
+	let keepingLen = keepingColumns.length;
+	let prevState = false;
 	if(newColLen > 1) {
 		prevState = this._grid.freezeLayout(true); // Insert multiple columns can be a huge time consuming
 	}
@@ -46201,7 +46272,7 @@ Grid.prototype.restoreColumns = function(columns, byId) {
 		for (j = 0; j < keepingLen; j++) { // loop only keeping column
 			if(compareLogic(columns[i], keepingColumns[j])) {
 				found = true;
-				var colIndex = this.getColumnIndex(columns[i].id || columns[i].field); // We cannot use 'i' (colIndex) in this case, as it will sort the columns. Instead, we need to obtain a new column index from the field.
+				let colIndex = this.getColumnIndex(columns[i].id || columns[i].field); // We cannot use 'i' (colIndex) in this case, as it will sort the columns. Instead, we need to obtain a new column index from the field.
 				columnOrdering.push(this.getColumnId(colIndex));
 				break;
 			}
@@ -46232,27 +46303,27 @@ Grid.prototype.setFields = Grid.prototype.setColumns;
 * @param {Object} e
 */
 Grid.prototype._onColumnAdded = function(e) {
-	var colDef = /** @type{ColumnDefinition} */(e.context[COL_DEF]);
+	let colDef = /** @type{ColumnDefinition} */(e.context[COL_DEF]);
 	delete e.context[COL_DEF];
-	var idx = e.colIndex;
+	let idx = e.colIndex;
 
-	var coreColDef = this._grid._getColumnDef(idx);
+	let coreColDef = this._grid._getColumnDef(idx);
 	colDef._setCoreColumnDef(coreColDef); // For column id and field
 
-	var colData = this._grid.getColumnData(idx);
+	let colData = this._grid.getColumnData(idx);
 	if(!colData) { // Save column inside grid
 		colData = this._grid.setColumnData(idx, {});
 	}
 	colData[COL_DEF] = colDef;
-	var userModel = colDef.getUserModel();
+	let userModel = colDef.getUserModel();
 	// binding
 	this._grid.setColumnDataBindingHandler(idx, colDef.getRenderer());
 	// width and scalable
-	var value = userModel["width"];
+	let value = userModel["width"];
 	// eslint-disable-next-line no-undefined
 	if(value !== undefined) {
 		value = +value;
-		var scalable;
+		let scalable;
 		if(userModel["scalable"] != null) {
 			scalable = userModel["scalable"] ? true : false;
 		} else {
@@ -46288,16 +46359,16 @@ Grid.prototype._onColumnAdded = function(e) {
 	}
 
 	// className
-	var i, classes = colDef.getClasses();
+	let i, classes = colDef.getClasses();
 	for(i = 0; i < classes.length; i++) {
 		this._grid.enableColumnClass(idx, classes[i]);
 	}
-	var colField = colDef.getField();
+	let colField = colDef.getField();
 	this._grid.setDataColumnName(idx, ROW_DEF); // This make ColumnDefinition renderer work
-	var fields = colDef.getAllFields();
-	var referrer = colDef.getId();
-	var len = fields.length;
-	var field, dataType, prom, onLoaded;
+	let fields = colDef.getAllFields();
+	let referrer = colDef.getId();
+	let len = fields.length;
+	let field, dataType, prom, onLoaded;
 	for(i = 0; i < len; i++) {
 		field = fields[i];
 		if(this._shouldLoadFieldInfo(field)) {
@@ -46335,12 +46406,12 @@ Grid.prototype._onColumnAdded = function(e) {
 * @see {@link Grid#removeAllColumns}
 */
 Grid.prototype.removeColumn = function(colRef) {
-	var colIndex = this.getColumnIndex(colRef);
+	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) {
 		return;
 	}
 
-	var colDef = this.getColumnDefinition(colIndex);
+	let colDef = this.getColumnDefinition(colIndex);
 
 	if(!colDef.isRealTimeField()) {
 		if(this._dc) {
@@ -46361,8 +46432,8 @@ Grid.prototype.removeColumn = function(colRef) {
 * @see {@link Grid#removeAllColumns}
 */
 Grid.prototype.removeColumns = function(colRefs) {
-	var indices = this.getColumnIndices(colRefs);
-	var len = indices.length;
+	let indices = this.getColumnIndices(colRefs);
+	let len = indices.length;
 	if(len <= 1) {
 		if(len === 1) {
 			this.removeColumn(indices[0]);
@@ -46371,12 +46442,12 @@ Grid.prototype.removeColumns = function(colRefs) {
 	}
 	indices.sort(Grid._descendingOrder); // Removal must be done from the back
 
-	var staticFields = []; // For clearing any data stored in our cache
-	var prevState = this._grid.freezeLayout(); // To prevent multiple UI updates
+	let staticFields = []; // For clearing any data stored in our cache
+	let prevState = this._grid.freezeLayout(); // To prevent multiple UI updates
 
-	for(var i = 0; i < len; ++i) {
-		var colIndex = indices[i];
-		var colDef = this.getColumnDefinition(colIndex);
+	for(let i = 0; i < len; ++i) {
+		let colIndex = indices[i];
+		let colDef = this.getColumnDefinition(colIndex);
 		if(!colDef.isRealTimeField()) {
 			staticFields.push(colDef.getField());
 		}
@@ -46398,7 +46469,7 @@ Grid.prototype.removeColumns = function(colRefs) {
 * @see {@link Grid#removeColumns}
 */
 Grid.prototype.removeAllColumns = function() {
-	var colCount = this.getColumnCount();
+	let colCount = this.getColumnCount();
 	if(colCount <= 0) {
 		return;
 	}
@@ -46406,10 +46477,10 @@ Grid.prototype.removeAllColumns = function() {
 	if(!this._sharedSorter) {
 		this.clearSort();
 	}
-	for(var i = colCount; --i >= 0;) {
+	for(let i = colCount; --i >= 0;) {
 		// WARNING: This may affect plugins event listeners
 		this._grid.setColumnDataBindingHandler(i, null);
-		var colDef = this.getColumnDefinition(i);
+		let colDef = this.getColumnDefinition(i);
 		colDef.dispose();
 	}
 	// TODO: Remove fields that are related to the column (e.g. fields for coloring)
@@ -46469,7 +46540,7 @@ Grid.prototype.reorderColumns = function (colRefs, destCol) {
 * @see {@link Grid#showAllColumns}
 */
 Grid.prototype.hideColumn = function(colRef, hidden) {
-	var colIndex = this.getColumnIndex(colRef);
+	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) { // not found
 		return;
 	}
@@ -46514,9 +46585,9 @@ Grid.prototype.addDataFields = function(fieldRef, referrer) {
 		return false;
 	}
 
-	var fields = Array.isArray(fieldRef) ? fieldRef : [fieldRef];
-	var len = fields.length;
-	var i, field, dataType, prom, onLoaded;
+	let fields = Array.isArray(fieldRef) ? fieldRef : [fieldRef];
+	let len = fields.length;
+	let i, field, dataType, prom, onLoaded;
 	for(i = 0; i < len; i++) {
 		field = fields[i];
 		if(this._shouldLoadFieldInfo(field)) {
@@ -46573,7 +46644,7 @@ Grid.prototype.sortColumn = function(colRef, opt_order) {
 		return;
 	}
 
-	var colIndex = this.getColumnIndex(colRef);
+	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) {
 		this._stp.sortColumn(this.getSortedColumnIndex(), "n"); // reset current sorting
 	} else {
@@ -46585,7 +46656,7 @@ Grid.prototype.sortColumn = function(colRef, opt_order) {
 * @param {string} str
 */
 Grid.prototype.setColumnName = function(colIndex, str) {
-	var colDef = this.getColumnDefinition(colIndex);
+	let colDef = this.getColumnDefinition(colIndex);
 	if(colDef) {
 		colDef.setName(str);
 		this.updateColumnTitle();
@@ -46596,7 +46667,7 @@ Grid.prototype.setColumnName = function(colIndex, str) {
 * @param {Function=} func
 */
 Grid.prototype.setColumnRenderer = function(colRef, func) {
-	var colIndex = this.getColumnIndex(colRef);
+	let colIndex = this.getColumnIndex(colRef);
 	this.setColumnFormatter(colIndex, func);
 };
 
@@ -46606,10 +46677,10 @@ Grid.prototype.setColumnRenderer = function(colRef, func) {
 * @param {Function=} func If not specified the renderer which corresponded id from mapping will be picked up
 */
 Grid.prototype.activateColumnRenderer = function(colRef, id, func) {
-	var colIndex = this.getColumnIndex(colRef);
+	let colIndex = this.getColumnIndex(colRef);
 	if (colIndex == null) { return; }
 
-	var colDef = this.getColumnDefinition(colIndex);
+	let colDef = this.getColumnDefinition(colIndex);
 	if(!colDef) { return; }
 
 	colDef.activateRenderer(id, func);
@@ -46626,12 +46697,12 @@ Grid.prototype.activateColumnRenderer = function(colRef, id, func) {
 Grid.prototype.setColumnFormatter = function (colIndex, formatter) {
 	if (colIndex == null) { return; }
 
-	var colDef = this.getColumnDefinition(colIndex);
+	let colDef = this.getColumnDefinition(colIndex);
 	if(!colDef) {
 		return;
 	}
 
-	var func = null;
+	let func = null;
 	if (formatter) {
 		if(typeof formatter === "object") {
 			if(typeof formatter.init === "function") { // Initialize predefined formatter
@@ -46648,8 +46719,8 @@ Grid.prototype.setColumnFormatter = function (colIndex, formatter) {
 	}
 
 	if(func !== colDef.getRenderer()) {
-		var section = this._grid.getSection("content");
-		var col = /** @type {Column} */section.getColumn(colIndex);
+		let section = this._grid.getSection("content");
+		let col = /** @type {Column} */section.getColumn(colIndex);
 		if (col) {
 			col.clearContent();
 		}
@@ -46668,12 +46739,12 @@ Grid.prototype.setColumnFormatter = function (colIndex, formatter) {
 * @param {ColumnDefinition~SortLogic=} func
 */
 Grid.prototype.setColumnSorter = function(colRef, func) {
-	var colIndex = this.getColumnIndex(colRef);
-	var colDef = this.getColumnDefinition(colIndex);
+	let colIndex = this.getColumnIndex(colRef);
+	let colDef = this.getColumnDefinition(colIndex);
 	if(colDef) {
 		colDef.setSorter(func);
 
-		var sortedColumn = this.getSortedColumnIndex(); // TODO: Support multi-column sorting
+		let sortedColumn = this.getSortedColumnIndex(); // TODO: Support multi-column sorting
 		if(sortedColumn === colIndex) {
 			this._stp.refresh();
 		}
@@ -46686,8 +46757,8 @@ Grid.prototype.setColumnSorter = function(colRef, func) {
 * @param {RowDefinition} rowDef
 */
 Grid.prototype._initDuplicateRicData = function(rowDef) {
-	var ric = rowDef.getSymbol();
-	var rowDefs = this._connector.getRowDefByRic(ric);
+	let ric = rowDef.getSymbol();
+	let rowDefs = this._connector.getRowDefByRic(ric);
 	if(rowDefs && rowDefs.length) {
 		cloneRowData(rowDefs[0], rowDef);
 	}
@@ -46697,7 +46768,7 @@ Grid.prototype._initDuplicateRicData = function(rowDef) {
 * @param {Grid~RowReference=} rowRef Reference (i.e. row index, row id, or row definition) of the insert position
 * @returns {RowDefinition}
 * @example
-* var grid = new rt.Grid(grid_div, options);
+* let grid = new rt.Grid(grid_div, options);
 * grid.insertRow({"ric": "RIC"}, 0); // A new row is added at the top
 */
 Grid.prototype.insertRow = function(rowOption, rowRef) {
@@ -46714,7 +46785,7 @@ Grid.prototype.insertRow = function(rowOption, rowRef) {
 			}
 		}
 	}
-	var rowDef = new RowDefinition(rowOption);
+	let rowDef = new RowDefinition(rowOption);
 	rowDef.setDataSource(this._dc); // This could also subscribe chain index/ric to JET/RTK
 	this._initDuplicateRicData(rowDef);
 
@@ -46730,7 +46801,7 @@ Grid.prototype.insertRow = function(rowOption, rowRef) {
 * @param {Grid~RowReference=} rowRef Reference (i.e. row index, row id, or row definition) of the insert position
 * @param {Array.<string>=} opt_fields
 * @example
-* var grid = new rt.Grid(grid_div, options);
+* let grid = new rt.Grid(grid_div, options);
 * grid.insertRows([
 *  {ric: "RIC"},
 *  {values: {"field1": 0, "field2": 1}},
@@ -46747,12 +46818,12 @@ Grid.prototype.insertRows = function(rowOptions, rowRef, opt_fields) {
 		return;
 	}
 
-	var prevState = this._dt.freeze(); // Avoid sorting for each inserted row
-	var fields = opt_fields || this.getColumnFields();
-	var rowId = this._getRowId(rowRef);
-	var len = rowOptions.length;
-	for(var r = 0; r < len; ++r) {
-		var rowOption = rowOptions[r];
+	let prevState = this._dt.freeze(); // Avoid sorting for each inserted row
+	let fields = opt_fields || this.getColumnFields();
+	let rowId = this._getRowId(rowRef);
+	let len = rowOptions.length;
+	for(let r = 0; r < len; ++r) {
+		let rowOption = rowOptions[r];
 		if(rowOption) {
 			if(typeof rowOption === "string") {
 				rowOption = { "ric": rowOption };
@@ -46770,7 +46841,7 @@ Grid.prototype.insertRows = function(rowOptions, rowRef, opt_fields) {
 * @see {@link Grid#logDV}
 * @see {@link Grid#logDT}
 * @example
-* var grid = new rt.Grid(grid_div, options);
+* let grid = new rt.Grid(grid_div, options);
 * grid.addStaticDataRows([
 *  [10, "a", true],
 *  [20, "b", false],
@@ -46791,7 +46862,7 @@ Grid.prototype.addStaticDataRows = function(dataRows, fields) {
 	}
 
 	if(!Array.isArray(dataRows)) {
-		var userObj = dataRows;
+		let userObj = dataRows;
 		dataRows = null;
 		if(userObj) {
 			if(userObj.fields && !fields) {
@@ -46855,13 +46926,15 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 	}
 
 	// Map new data index
-	var recordCount = records.length;
-	var fieldSorting = "ROW_ORDER"; // TODO: Should be config by options
-	var oldDataMap = {};
-	var rowDef, id, record, i;
-	var rowDefs = this.getAllRowDefinitions(); // Include the filter/hidden rows
-	var rowDefCount = rowDefs.length;
+	let recordCount = records.length;
+	let fieldSorting = "ROW_ORDER"; // TODO: Should be config by options
+	let oldDataMap = {};
+	let rowDef, id, record, i;
+	let rowDefs = this.getAllRowDefinitions(); // Include the filter/hidden rows
+	let rowDefCount = rowDefs.length;
+	let prevState = false;
 	if(rowIdentifier) {
+		prevState = this._dt.freeze();
 		for (i = 0; i < rowDefCount; i++) {
 			rowDef = rowDefs[i];
 			if(rowDef) {
@@ -46874,8 +46947,8 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 			}
 		}
 
-		var idMap = {};
-		var newDataMap = {};
+		let idMap = {};
+		let newDataMap = {};
 		for (i = recordCount - 1; i >= 0; i--) {
 			record = records[i];
 			id = record[rowIdentifier];
@@ -46893,13 +46966,17 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 			}
 		}
 		// Check Remove previous data
-		for (var rowIdentifierName in oldDataMap) {
+		for (let rowIdentifierName in oldDataMap) {
 			if (oldDataMap[rowIdentifierName] && !newDataMap[rowIdentifierName]) {
 				this.removeRow(oldDataMap[rowIdentifierName]); // Slow
 			}
 		}
 		this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
+		this._dt.freeze(prevState);
 	} else {
+		if(recordCount - rowDefCount > 1 || rowDefCount - recordCount > 1) {
+			prevState = this._dt.freeze();
+		}
 		for (i = 0; i < rowDefCount; i++) {
 			record = records[i];
 			if(record) {
@@ -46918,6 +46995,9 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 				rowDef.setRowData(record);
 			}
 		}
+		if(recordCount - rowDefCount > 1 || rowDefCount - recordCount > 1) {
+			this._dt.freeze(prevState);
+		}
 	}
 };
 /** @private
@@ -46937,7 +47017,7 @@ Grid.prototype.removeRow = function(rowRef) {
 	if(this._mainGrid) {
 		return this._mainGrid.removeRow(this._getRowId(rowRef));
 	}
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		if(!rowDef.isAutoGenerated()) { // Users cannot remove auto-generated row by themselves
 			this._removeRow(rowDef);
@@ -46953,7 +47033,7 @@ Grid.prototype.removeRow = function(rowRef) {
 * @see {@link Grid#removeAllRows}
 */
 Grid.prototype.removeRows = function(rowRefs) {
-	var rowDef;
+	let rowDef;
 	if(!Array.isArray(rowRefs)) {
 		rowDef = this.removeRow(rowRefs);
 		return rowDef ? [rowDef] : [];
@@ -46962,9 +47042,9 @@ Grid.prototype.removeRows = function(rowRefs) {
 		return this._mainGrid.removeRows(rowRefs.map(this._getRowId));
 	}
 
-	var i;
-	var rowDefs = [];
-	var len = rowRefs.length;
+	let i;
+	let rowDefs = [];
+	let len = rowRefs.length;
 
 	// Verify user input
 	for(i = 0; i < len; ++i) {
@@ -46977,7 +47057,7 @@ Grid.prototype.removeRows = function(rowRefs) {
 	}
 	len = rowDefs.length;
 
-	var prevState = false;
+	let prevState = false;
 	if(len > 1) {
 		prevState = this._dt.freeze(); // Prevent multiple changes that trigger sorting and filtering
 	}
@@ -47002,7 +47082,7 @@ Grid.prototype.removeAllRows = function() {
 	if(!this._dt.getRowCount()) {
 		return;
 	}
-	var rowDefs = this._getAllRowDefinitions();
+	let rowDefs = this._getAllRowDefinitions();
 
 	if(!this._sharedDataSource) {
 		this._dc.clearAllData();
@@ -47030,14 +47110,14 @@ Grid.prototype._removeRow = function(rowDef) {
 	}
 	this._dispatch("beforeRowRemoved", {});
 
-	var connector = this._connector;
-	var dt = this._dt;
-	var childRowDefs = rowDef.getDescendants(); // TODO: Support nested child
+	let connector = this._connector;
+	let dt = this._dt;
+	let childRowDefs = rowDef.getDescendants(); // TODO: Support nested child
 	if(childRowDefs) { // Remove all children first
-		for(var i = 0; i < childRowDefs.length; i++) {
+		for(let i = 0; i < childRowDefs.length; i++) {
 			connector.removeRic(childRowDefs[i]);
 		}
-		var rowIds = childRowDefs.map(RowDefinition.toRowId);
+		let rowIds = childRowDefs.map(RowDefinition.toRowId);
 		dt.removeRows(rowIds);
 	}
 	connector.removeRic(rowDef);
@@ -47050,8 +47130,8 @@ Grid.prototype._removeRow = function(rowDef) {
 * @param {boolean=} hidden if false, show instead of hide
 */
 Grid.prototype.hideRow = function(rowRef, hidden) {
-	var rid = this._getRowId(rowRef);
-	var grid = this._mainGrid || this._grid;
+	let rid = this._getRowId(rowRef);
+	let grid = this._mainGrid || this._grid;
 	grid.hideRow(rid, hidden);
 };
 
@@ -47064,8 +47144,8 @@ Grid.prototype.hideRows = function (rowRefs, hidden) {
 	if (!Array.isArray(rowRefs)) {
 		rowRefs = [rowRefs];
 	}
-	var rids = rowRefs.map(this._getRowId);
-	var grid = this._mainGrid || this._grid;
+	let rids = rowRefs.map(this._getRowId);
+	let grid = this._mainGrid || this._grid;
 	grid.hideRows(rids, hidden);
 };
 /**
@@ -47103,19 +47183,19 @@ Grid.prototype.setRic = function(rowRef, str, options) {
 		this._mainGrid.setRic(this._toRowId(rowRef), str, options);
 		return;
 	}
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		options = options || {};
 		options["ric"] = str;
-		var extractedOptions = RowDefinition.extractRowOptions(options);
-		var oldRic = rowDef.getSymbol();
+		let extractedOptions = RowDefinition.extractRowOptions(options);
+		let oldRic = rowDef.getSymbol();
 		if(rowDef.setContent(str, extractedOptions)) { // The given string may not be a RIC
 			this._connector.removeRic(rowDef, oldRic);
 			this._initDuplicateRicData(rowDef);
 			this._connector.addRic(rowDef);
 		}
 
-		var values = options["values"];
+		let values = options["values"];
 		if(values != null) {
 			rowDef.setStaticRowData(values, options["fields"]);
 		}
@@ -47131,7 +47211,7 @@ Grid.prototype.setRic = function(rowRef, str, options) {
  * @param {Grid~RowReference} rowRef
  */
 Grid.prototype.unlinkChain = function(rowRef) {
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(!rowDef) {
 		return;
 	}
@@ -47170,7 +47250,7 @@ Grid.prototype._onRowExpansionBinding = function(e) {
 	}
 
 	if(e["originalRowId"]) {
-		var rowIndex = this._dv.getRowIndex(e["originalRowId"]);
+		let rowIndex = this._dv.getRowIndex(e["originalRowId"]);
 		e["originalRowDef"] = this._getRowDefinitionByIndex(rowIndex);
 		e["originalRowData"] = e["originalRowDef"].getRowData();
 	} else {
@@ -47224,7 +47304,7 @@ Grid.prototype.getColumnCount = function() {
 * @return {string}
 */
 Grid.prototype.getColumnDataType = function(colIndex) {
-	var colDef = this.getColumnDefinition(colIndex);
+	let colDef = this.getColumnDefinition(colIndex);
 	if (colDef) {
 		return colDef.getDataType();
 	}
@@ -47235,7 +47315,7 @@ Grid.prototype.getColumnDataType = function(colIndex) {
 * @return {ColumnDefinition}
 */
 Grid.prototype.getColumnDefinition = function(colIndex) {
-	var colData = this._grid.getColumnData(colIndex);
+	let colData = this._grid.getColumnData(colIndex);
 	if(colData) {
 		return /** @type{ColumnDefinition} */(colData[COL_DEF]) || null;
 	}
@@ -47245,9 +47325,9 @@ Grid.prototype.getColumnDefinition = function(colIndex) {
 * @return {!Array.<ColumnDefinition>}
 */
 Grid.prototype.getColumnDefinitions = function() {
-	var colCount = this.getColumnCount();
-	var colDefs = new Array(colCount);
-	for(var i = 0; i < colCount; i++) {
+	let colCount = this.getColumnCount();
+	let colDefs = new Array(colCount);
+	for(let i = 0; i < colCount; i++) {
 		colDefs[i] = this.getColumnDefinition(i);
 	}
 	return colDefs;
@@ -47269,10 +47349,10 @@ Grid.prototype.getColumnDefinitionById = function(colId) {
 * @return {ColumnDefinition}
 */
 Grid.prototype.getColumnDefinitionsById = function(colIds) {
-	var colCount = Array.isArray(colIds) ? colIds.length : 0;
+	let colCount = Array.isArray(colIds) ? colIds.length : 0;
 	if(colCount > 0) {
-		var i, colId;
-		var colDefs = new Array(colCount);
+		let i, colId;
+		let colDefs = new Array(colCount);
 		for(i = 0; i < colCount; i++) {
 			colId = colIds[i];
 			colDefs[i] = this.getColumnDefinitionById(colId);
@@ -47292,9 +47372,9 @@ Grid.prototype._getColumnDefinition = function(colRef) {
 	} else if(typeof colRef === "number") {
 		return this.getColumnDefinition(colRef);
 	} else if(typeof colRef === "string") {
-		var colCount = this.getColumnCount();
-		for(var i = 0; i < colCount; ++i) {
-			var colDef = this.getColumnDefinition(i);
+		let colCount = this.getColumnCount();
+		for(let i = 0; i < colCount; ++i) {
+			let colDef = this.getColumnDefinition(i);
 			if(_hasFieldOrId(colDef, colRef)) {
 				return colDef; // Return the first found column
 			}
@@ -47307,7 +47387,7 @@ Grid.prototype._getColumnDefinition = function(colRef) {
 * @return {string}
 */
 Grid.prototype.getRowType = function(rowRef) {
-	var rowDef = this.getRowDefinition(rowRef);
+	let rowDef = this.getRowDefinition(rowRef);
 	return rowDef ? rowDef.getType() : "";
 };
 /** Get RowDefinition object by either number or row id
@@ -47399,15 +47479,15 @@ Grid.prototype.getMultipleRowData = function(obj) {
 	if(typeof obj === "number") {
 		return [this.getRowData(obj)];
 	}
-	var rowDefs = null;
+	let rowDefs = null;
 	if(Array.isArray(obj)) {
-		var rowRefs = obj;
-		var rowCount = rowRefs.length;
-		var rows = new Array(rowCount);
+		let rowRefs = obj;
+		let rowCount = rowRefs.length;
+		let rows = new Array(rowCount);
 		rowDefs = this.getRowDefinitions();
 
-		for(var r = 0; r < rowCount; ++r) {
-			var rowRef = rowRefs[r];
+		for(let r = 0; r < rowCount; ++r) {
+			let rowRef = rowRefs[r];
 			if(typeof rowRef === "number") {
 				rows[r] = toRowData(rowDefs[rowRef]);
 			} else if(rowRef && rowRef.getRowData) {
@@ -47430,10 +47510,10 @@ Grid.prototype.getMultipleRowData = function(obj) {
 * @param {Object} values {"FIELD1": value1, "FIELD2": value2, ...} Use null to remove current row data (not row in the view).
 */
 Grid.prototype.setRicData = function(ric, values) {
-	var rowDefs = this._connector.getRowDefByRic(ric);
-	var rowCount = rowDefs ? rowDefs.length : 0;
-	for (var i = 0; i < rowCount; ++i) {
-		var rowDef = rowDefs[i];
+	let rowDefs = this._connector.getRowDefByRic(ric);
+	let rowCount = rowDefs ? rowDefs.length : 0;
+	for (let i = 0; i < rowCount; ++i) {
+		let rowDef = rowDefs[i];
 		if (rowDef && rowDef.getSymbol() === ric) {
 			rowDef.setRowData(values); // TODO: Need conflator to improve performance
 		}
@@ -47445,7 +47525,7 @@ Grid.prototype.setRicData = function(ric, values) {
 * @param {Object} values {"FIELD1": value1, "FIELD2": value2, ...} Use null to remove current row data (not row in the view).
 */
 Grid.prototype.setRowData = function(rowRef, values) {
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.setRowData(values);
 	}
@@ -47457,7 +47537,7 @@ Grid.prototype.setRowData = function(rowRef, values) {
 * @param {Object} values
 */
 Grid.prototype.setStaticRowData = function(rowRef, values) {
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.setStaticRowData(values);
 	}
@@ -47470,7 +47550,7 @@ Grid.prototype.setStaticRowData = function(rowRef, values) {
 * @param {*} value
 */
 Grid.prototype.setStaticData = function(rowRef, field, value) {
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.setStaticData(field, value);
 	}
@@ -47498,9 +47578,9 @@ Grid.prototype._getRowId = function(rowRef) {
 Grid.prototype.getColumnIndex = function(colRef) {
 	if(colRef) {
 		if(colRef instanceof ColumnDefinition) {
-			var colCount = this.getColumnCount();
-			for(var i = 0; i < colCount; ++i) {
-				var colDef = this.getColumnDefinition(i);
+			let colCount = this.getColumnCount();
+			for(let i = 0; i < colCount; ++i) {
+				let colDef = this.getColumnDefinition(i);
 				if(colDef === colRef) {
 					return i;
 				}
@@ -47516,13 +47596,13 @@ Grid.prototype.getColumnIndex = function(colRef) {
 * @return {!Array.<number>}
 */
 Grid.prototype.getColumnIndices = function(colRefs) {
-	var ary = [];
-	var colCount = this.getColumnCount();
-	var inputAry = Array.isArray(colRefs) ? colRefs : [colRefs];
-	var len = inputAry.length;
+	let ary = [];
+	let colCount = this.getColumnCount();
+	let inputAry = Array.isArray(colRefs) ? colRefs : [colRefs];
+	let len = inputAry.length;
 	// Verify user input
-	for(var i = 0; i < len; ++i) {
-		var colIndex = this.getColumnIndex(inputAry[i]);
+	for(let i = 0; i < len; ++i) {
+		let colIndex = this.getColumnIndex(inputAry[i]);
 		if(colIndex >= 0 && colIndex < colCount) {
 			ary.push(colIndex); // WARNING: We have not checked for duplication
 		}
@@ -47597,11 +47677,11 @@ Grid.prototype.freezeColumn = function(colIndex, pinnedRightColumns) {
 */
 Grid.prototype.pinColumn = function(colRef, side) {
 	if(Array.isArray(colRef)) {
-		var ary = colRef;
-		var len = ary.length;
+		let ary = colRef;
+		let len = ary.length;
 
-		var dirty = 0;
-		for(var i = 0; i < len; ++i) {
+		let dirty = 0;
+		for(let i = 0; i < len; ++i) {
 			dirty |= this._pinColumn(ary[i], side);
 		}
 		return dirty ? true : false;
@@ -47614,18 +47694,18 @@ Grid.prototype.pinColumn = function(colRef, side) {
 * @return {boolean}
 */
 Grid.prototype._pinColumn = function(colRef, side) {
-	var colIndex = this.getColumnIndex(colRef);
-	var colCount = this.getColumnCount();
+	let colIndex = this.getColumnIndex(colRef);
+	let colCount = this.getColumnCount();
 	if(colIndex < 0 || colIndex > colCount) {
 		return false;
 	}
 
-	var leftPinnedCount = this._grid.getPinnedLeftColumnCount();
-	var rightPinnedCount = this._grid.getPinnedRightColumnCount();
-	var stationaryIdx = this._grid.getStationaryColumnIndex();
+	let leftPinnedCount = this._grid.getPinnedLeftColumnCount();
+	let rightPinnedCount = this._grid.getPinnedRightColumnCount();
+	let stationaryIdx = this._grid.getStationaryColumnIndex();
 
 	if(side && side.toLowerCase() === "right") {
-		var rightPinnedIndex = this._grid.getFirstPinnedRightIndex();
+		let rightPinnedIndex = this._grid.getFirstPinnedRightIndex();
 		if(colIndex >= rightPinnedIndex) {
 			return false; // The column is already pinned area
 		}
@@ -47664,11 +47744,11 @@ Grid.prototype._pinColumn = function(colRef, side) {
 */
 Grid.prototype.unpinColumn = function(colRef, dest) {
 	if(Array.isArray(colRef)) {
-		var ary = colRef;
-		var len = ary.length;
+		let ary = colRef;
+		let len = ary.length;
 
-		var dirty = 0;
-		for(var i = len; --i >= 0;) { // WARNING: unpinning is done in reversed order
+		let dirty = 0;
+		for(let i = len; --i >= 0;) { // WARNING: unpinning is done in reversed order
 			dirty |= this._unpinColumn(ary[i], dest);
 		}
 		return dirty ? true : false;
@@ -47681,29 +47761,29 @@ Grid.prototype.unpinColumn = function(colRef, dest) {
 * @return {boolean}
 */
 Grid.prototype._unpinColumn = function(colRef, dest) {
-	var colIndex = this.getColumnIndex(colRef);
+	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) {
 		return false;
 	}
 
-	var leftPinnedCount = this._grid.getPinnedLeftColumnCount();
-	var rightPinnedCount = this._grid.getPinnedRightColumnCount();
-	var colCount = this.getColumnCount();
-	var firstRightPinnedIndex = colCount - rightPinnedCount;
+	let leftPinnedCount = this._grid.getPinnedLeftColumnCount();
+	let rightPinnedCount = this._grid.getPinnedRightColumnCount();
+	let colCount = this.getColumnCount();
+	let firstRightPinnedIndex = colCount - rightPinnedCount;
 
 	if(colIndex >= leftPinnedCount && colIndex < firstRightPinnedIndex) {
 		return false;
 	}
 
-	var srcId = null;
-	var destId = null;
+	let srcId = null;
+	let destId = null;
 	if(dest != null) {
-		var destIdx = this.getColumnIndex(dest);
+		let destIdx = this.getColumnIndex(dest);
 		destId = this.getColumnId(destIdx);
 		srcId = this.getColumnId(colIndex);
 	}
 
-	var stationaryIdx = this._grid.getStationaryColumnIndex();
+	let stationaryIdx = this._grid.getStationaryColumnIndex();
 
 	if(colIndex < leftPinnedCount) {
 		if(colIndex > stationaryIdx) {
@@ -47732,8 +47812,8 @@ Grid.prototype._unpinColumn = function(colRef, dest) {
 * @return {boolean}
 */
 Grid.prototype.unpinAllColumns = function() {
-	var leftPinnedCount = this._grid.getPinnedLeftColumnCount();
-	var rightPinnedCount = this._grid.getPinnedRightColumnCount();
+	let leftPinnedCount = this._grid.getPinnedLeftColumnCount();
+	let rightPinnedCount = this._grid.getPinnedRightColumnCount();
 	if(!leftPinnedCount && !rightPinnedCount) {
 		return false;
 	}
@@ -47749,8 +47829,8 @@ Grid.prototype._onColumnHeaderBinding = function(e) {
 		return; // WARNING: Assume that only the first title section is owned by the grid. Anything else is assumed to be generated by plugins
 	}
 
-	var c = e["fromColIndex"];
-	var toC = e["toColIndex"];
+	let c = e["fromColIndex"];
+	let toC = e["toColIndex"];
 	while(c < toC) {
 		this._renderColumnHeader(c++, e);
 	}
@@ -47760,22 +47840,22 @@ Grid.prototype._onColumnHeaderBinding = function(e) {
 * @param {Object} arg
 */
 Grid.prototype._renderColumnHeader = function(colIndex, arg) {
-	var colDef = this.getColumnDefinition(colIndex);
+	let colDef = this.getColumnDefinition(colIndex);
 	if(!colDef) {
 		return;
 	}
-	var customRenderer = colDef.getHeaderRenderer();
-	var tSection = arg.section;
-	var rowCount = tSection.getRowCount();
+	let customRenderer = colDef.getHeaderRenderer();
+	let tSection = arg.section;
+	let rowCount = tSection.getRowCount();
 	arg["colIndex"] = colIndex;
 	arg["columnDef"] = colDef;
 
-	var colName = colDef.getName();
-	var colTooltip = colDef.getTooltip();
-	var headerAlignment = colDef.getHeaderAlignment();
+	let colName = colDef.getName();
+	let colTooltip = colDef.getTooltip();
+	let headerAlignment = colDef.getHeaderAlignment();
 
-	for(var r = 0; r < rowCount; ++r) {
-		var tCell = tSection.getCell(colIndex, r, false);
+	for(let r = 0; r < rowCount; ++r) {
+		let tCell = tSection.getCell(colIndex, r, false);
 		// Default behaviors
 		tCell.setContent(colName);
 		tCell.setTooltip(colTooltip);
@@ -47794,7 +47874,7 @@ Grid.prototype.updateColumnTitle = function() {
 	if(this._columnTitleConflator.conflate()) {
 		return;
 	}
-	var tss = this._grid.getSectionSettings("title"); // WARNING: Assume that only the first title section is owned by the grid
+	let tss = this._grid.getSectionSettings("title"); // WARNING: Assume that only the first title section is owned by the grid
 	if(tss) {
 		tss.rerender();
 	}
@@ -47840,17 +47920,17 @@ Grid.prototype._onQuote2PostUpdate = function (e) {
 * @param {!Object} e
 */
 Grid.prototype._onDataChanged = function(e) {
-	var rowData = e["rowData"]; // Use rowData to retrieve corresponding subscription object
+	let rowData = e["rowData"]; // Use rowData to retrieve corresponding subscription object
 	if (!rowData) {
 		return; // This must be a global change
 	}
-	var rowDef = rowData[ROW_DEF];
+	let rowDef = rowData[ROW_DEF];
 
 	if(rowDef) {
-		var rowId = rowDef.getRowId();
+		let rowId = rowDef.getRowId();
 		if(rowId) {
 			// e["rid"] could be from JET/RTK (rowId + ric) or static data update (rowId)
-			var curRowData = this._dc.getRowData(e["rid"]);
+			let curRowData = this._dc.getRowData(e["rid"]);
 			if (curRowData) {
 				if(rowDef.addUpdate(e)) { // This is the only place that update array can grow. It is used for blinking data.
 					this._dt._hasNewUpdates = true; // Mark data table for cleaning it up later
@@ -47865,9 +47945,9 @@ Grid.prototype._onDataChanged = function(e) {
 	}
 
 	// The new data update has no row definition, meaning that we have found a new constituent from a chain.
-	var subId = rowData[SUB_ID]; // The constituent will share the same sub id as its parent
+	let subId = rowData[SUB_ID]; // The constituent will share the same sub id as its parent
 	if(subId) {
-		var parentDef = this._getRowDefinitionById(subId);
+		let parentDef = this._getRowDefinitionById(subId);
 		if(parentDef && parentDef.getRic() !== rowData["RIC"]) { // TODO: Check for delayed ric
 			if(!this._chainMembers) {
 				this._chainMembers = {};
@@ -47887,21 +47967,21 @@ Grid.prototype._addMemberOfChain = function(rowData) {
 		return;
 	}
 
-	var rows = this._chainConflator.popAllData(); // This must have no duplication
-	var len = rows ? rows.length : 0;
-	var i;
+	let rows = this._chainConflator.popAllData(); // This must have no duplication
+	let len = rows ? rows.length : 0;
+	let i;
 
-	var prevState = false;
+	let prevState = false;
 	if(len > 1) {
 		prevState = this._dt.freeze(); // Avoid sorting for each insertion
 	}
-	var childDefs = [];
+	let childDefs = [];
 	for(i = 0; i < len; ++i) {
 		rowData = /** @type{!Object} */(rows[i]);
-		var subId = rowData[SUB_ID];
-		var parentDef = this._getRowDefinitionById(subId);
+		let subId = rowData[SUB_ID];
+		let parentDef = this._getRowDefinitionById(subId);
 		if(parentDef) {
-			var childDef = parentDef.addConstituent(/** @type{string} */(rowData["RIC"]), this._dt);
+			let childDef = parentDef.addConstituent(/** @type{string} */(rowData["RIC"]), this._dt);
 			if(childDef) {
 				childDefs.push(childDef);
 			} // else { // childDef has already been added
@@ -47909,7 +47989,7 @@ Grid.prototype._addMemberOfChain = function(rowData) {
 	}
 	this._chainMembers = null; // Clear all waiting chain members
 
-	var childCount = childDefs.length;
+	let childCount = childDefs.length;
 	if(childCount) {
 		for(i = childCount; --i >= 0;) {
 			this._connector.addRic(childDefs[i]); // TODO: JET/RTK should not re-subscribe this
@@ -47937,19 +48017,19 @@ Grid.prototype._updateStreamingData = function() {
 * @param {Object} e
 */
 Grid.prototype._onPreDataSorting = function (e) {
-	var objs = this._stp.getSortedColumns();
+	let objs = this._stp.getSortedColumns();
 
 	this._sorter.reset();
 	if(Array.isArray(objs)) {
-		var sortCount = objs.length;
-		for(var i = 0; i < sortCount; ++i) {
-			var obj = objs[i];
-			var field = obj["field"] || "";
-			var colIndex = obj["colIndex"];
-			var colDef = (colIndex >= 0) ? this.getColumnDefinition(colIndex) : null;
-
-			var rowSorting = false;
-			var sortLogic = null;
+		let sortCount = objs.length;
+		for(let i = 0; i < sortCount; ++i) {
+			let obj = objs[i];
+			let field = obj["field"] || "";
+			let colIndex = obj["colIndex"];
+			let colDef = (colIndex >= 0) ? this.getColumnDefinition(colIndex) : null;
+
+			let rowSorting = false;
+			let sortLogic = null;
 			if(colDef) {
 				field = colDef.getField(); // WARNING: Field and logic could be out of sync
 				rowSorting = colDef.isRowSorting();
@@ -47995,10 +48075,10 @@ Grid.prototype._clearDataUpdates = function() {
 	if(!this._dt || !this._dt._hasNewUpdates) {
 		return;
 	}
-	var rowIds = this._dt.getAllRowIds(true); // Use shallow copy for speed
-	for(var i = rowIds.length; --i >= 0;) {
-		var rowData = this._dt.getRowData(rowIds[i]);
-		var rowDef = rowData[ROW_DEF];
+	let rowIds = this._dt.getAllRowIds(true); // Use shallow copy for speed
+	for(let i = rowIds.length; --i >= 0;) {
+		let rowData = this._dt.getRowData(rowIds[i]);
+		let rowDef = rowData[ROW_DEF];
 		rowDef.resetUpdates();
 	}
 };
@@ -48046,7 +48126,7 @@ Grid.prototype.getPageCount = function() {
  * @param {Grid~RowReference} rowRef
  */
 Grid.prototype.toggleChain = function(rowRef) {
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.toggleChain();
 	}
@@ -48058,7 +48138,7 @@ Grid.prototype.toggleChain = function(rowRef) {
  * @return {boolean}
  */
 Grid.prototype.setClassification = function(rowRef, fields) {
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		return this._dt.setSegmentClassification(rowDef.getRowId(), fields);
 	}
@@ -48083,7 +48163,7 @@ Grid.prototype.contains = function(elem) {
  * @return {boolean}
  */
 Grid.prototype.isFocused = function() {
-	var activeElement = document.activeElement;
+	let activeElement = document.activeElement;
 	if(!activeElement || !activeElement.shadowRoot) {
 		// active element is not in the shadow DOM. try using contains method to check
 		return this.contains(activeElement);
@@ -48150,17 +48230,17 @@ Grid.prototype._onFormulaDataRequired = function(e) {
 * @param {Object} e
 */
 Grid.prototype._onDataComposed = function(e) {
-	var values = e["changes"];
+	let values = e["changes"];
 	if(!values) {
 		return; // Cannot do data composition if there is no change in data
 	}
 
-	var rowData = e["rowData"];
+	let rowData = e["rowData"];
 	if(!rowData) {
 		return; // Row could already be removed or global change event is sent
 	}
 
-	var rowDef = rowData[ROW_DEF];
+	let rowDef = rowData[ROW_DEF];
 	if(!rowDef) {
 		return;
 	}
@@ -48169,7 +48249,7 @@ Grid.prototype._onDataComposed = function(e) {
 	}
 
 	if(this._autoDateConversion) { // auto data conversion
-		var field, value, dataType, colDef;
+		let field, value, dataType, colDef;
 		for(field in values) {
 			colDef = this._getColumnDefinition(field);
 			if(colDef) {
@@ -48199,16 +48279,16 @@ Grid.prototype._onDataComposed = function(e) {
 * @param {Object} e
 */
 Grid.prototype._onSubSegmentChanged = function(e) {
-	var insertionList = /** @type{Array.<Segment>} */(e["insertionList"]);
-	var removalList = /** @type{Array.<string>} */(e["removalList"]);
-	var removedRows = /** @type{Object} */(e["removedRows"]);
+	let insertionList = /** @type{Array.<Segment>} */(e["insertionList"]);
+	let removalList = /** @type{Array.<string>} */(e["removalList"]);
+	let removedRows = /** @type{Object} */(e["removedRows"]);
 
-	var i;
-	var removalCount = removalList.length;
-	var rowDef = null;
+	let i;
+	let removalCount = removalList.length;
+	let rowDef = null;
 	for(i = 0; i < removalCount; i++) {
-		var rid = removalList[i];
-		var removedRow = removedRows[rid];
+		let rid = removalList[i];
+		let removedRow = removedRows[rid];
 		if(removedRow) {
 			rowDef = removedRow[ROW_DEF];
 			if(rowDef) {
@@ -48218,11 +48298,11 @@ Grid.prototype._onSubSegmentChanged = function(e) {
 		}
 	}
 
-	var insertionCount = insertionList.length;
+	let insertionCount = insertionList.length;
 	for(i = 0; i < insertionCount; i++) {
-		var segment = insertionList[i];
-		// var parentId = segment.getParentId();
-		var segmentId = segment.getId();
+		let segment = insertionList[i];
+		// let parentId = segment.getParentId();
+		let segmentId = segment.getId();
 		rowDef = new RowDefinition({
 			"segmentId": segmentId
 		});
@@ -48242,10 +48322,10 @@ Grid.prototype._recalculateFormulas = function(e) {
 	if(e && e["rid"]) {
 		this._fnEngine.calculate(/** @type{Object.<string, *>} */ (e["rowData"]), /** @type{Object.<string, *>} */ (e["changes"]));
 	} else {
-		var rows = this._dc ? this._dc.getAllRowData() : null; // Slow
+		let rows = this._dc ? this._dc.getAllRowData() : null; // Slow
 
-		var rowCount = rows ? rows.length : 0;
-		for(var r = 0; r < rowCount; ++r) { // WARNING: This is very slow
+		let rowCount = rows ? rows.length : 0;
+		for(let r = 0; r < rowCount; ++r) { // WARNING: This is very slow
 			this._fnEngine.calculate(rows[r]);
 		}
 	}
@@ -48257,11 +48337,11 @@ Grid.prototype._recalculateFormulas = function(e) {
 Grid.prototype._snapshotFillerDataChanged = function (e) {
 	if (!this._dt) return;
 
-	var data = e.data;
+	let data = e.data;
 	if(e.timeSeries) {
 		this._updateTimeSeriesFields(e); // Increase or decrease time series field
 	} else {
-		for (var ric in data) {
+		for (let ric in data) {
 			this.setRicData(ric, data[ric]);
 		}
 	}
@@ -48276,7 +48356,7 @@ Grid.prototype._snapshotFillerDataChanged = function (e) {
 Grid.prototype._startPolling = function () {
 	if(this._pollingEnabled && this._pollingInterval) {
 		if(this._lastPollingRequest && !this._pollingTimerId) {
-			var now = new Date();
+			let now = new Date();
 			this._lastPollingRequest = now.getTime();
 			this._pollingTimerId = setTimeout(this._onPollingInterval, this._pollingInterval);
 		}
@@ -48298,9 +48378,9 @@ Grid.prototype.activateADCPolling = function (activated) {
 	if(activated !== false) {
 		this._pollingEnabled = true;
 		// Make immediate request after re-activation if it has been a long time
-		var now = new Date();
+		let now = new Date();
 		if(this._lastPollingRequest) {
-			var diff = now.getTime() - this._lastPollingRequest;
+			let diff = now.getTime() - this._lastPollingRequest;
 			if(diff > this._pollingInterval) {
 				this.refreshADCData();
 			}
@@ -48315,7 +48395,7 @@ Grid.prototype.activateADCPolling = function (activated) {
 * @return {boolean} Return true, if a request has been made
 */
 Grid.prototype.refreshADCData = function () {
-	var dirty = this._snapshot.addFields(this._connector.getAllFields());
+	let dirty = this._snapshot.addFields(this._connector.getAllFields());
 	if(dirty) {
 		dirty = this._snapshot.addRics(this._connector.getAllRics());
 		if(dirty) {
@@ -48329,9 +48409,9 @@ Grid.prototype.refreshADCData = function () {
 /** @private
 */
 Grid.prototype._onAutoLayoutUpdate = function() {
-	var elem = this._topNode;
+	let elem = this._topNode;
 
-	var cw = elem.clientWidth;
+	let cw = elem.clientWidth;
 	if(cw !== this._clientWidth) {
 		this._clientWidth = cw;
 		this.updateLayout();
@@ -48343,7 +48423,7 @@ Grid.prototype._onAutoLayoutUpdate = function() {
  * @param {Object=} opt_options { "colNames": Array.<string>, "rowCount": number, "startIndex": number, "getter": function(Object, string):* }
  */
 Grid.prototype.logDT = function(opt_options) {
-	var rowDefs = this._getAllRowDefinitions();
+	let rowDefs = this._getAllRowDefinitions();
 	this._logData(rowDefs, opt_options);
 };
 /** @description Log DataView to console. By default, this will log only fields specified in the column definition. To see other column data use "colNames" options
@@ -48361,7 +48441,7 @@ Grid.prototype.logDT = function(opt_options) {
 grid.logDV({"rowCount": 10}); // Showing 10 records
  */
 Grid.prototype.logDV = function(opt_options) {
-	var rowDefs = this.getRowDefinitions();
+	let rowDefs = this.getRowDefinitions();
 	this._logData(rowDefs, opt_options);
 };
 /** Log the collection of data to console
@@ -48377,7 +48457,7 @@ Grid.prototype._logData = function(rowDefs, options) {
 		// TODO: Get all required fields and eliminate duplicate fields
 		options["colNames"] = this.getColumnFields();
 	}
-	var tbl = DataCache_DataCache.constructTable(rowDefs.map(toRowData), options);
+	let tbl = DataCache_DataCache.constructTable(rowDefs.map(toRowData), options);
 
 	console.table(tbl); // eslint-disable-line
 };
@@ -48389,17 +48469,17 @@ Grid.prototype._logData = function(rowDefs, options) {
 * @returns {RowDefinition}
 */
 Grid.prototype.replaceRow = function(rowRef, rowOption) {
-	var rowId = this._getRowId(rowRef);
-	var rowDef = this._getRowDefinitionByRef(rowRef);
+	let rowId = this._getRowId(rowRef);
+	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef.isAutoGenerated()) { // Users cannot replace auto-generated
 		return  null;
 	}
-	var configObj = rowDef.getConfigObject();
+	let configObj = rowDef.getConfigObject();
 
 	if(deepEqual(configObj, rowOption)){
 		return null;
 	} else {
-		var insertedRow = this.insertRow(rowOption, rowId);
+		let insertedRow = this.insertRow(rowOption, rowId);
 		this.removeRow(rowId);
 		return insertedRow;
 	}