@refinitiv-ui/efx-grid 6.0.140 → 6.0.141

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

@@ -1,101 +1,10 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
-
-// EXPORTS
-__webpack_require__.d(__webpack_exports__, "Grid", function() { return /* reexport */ Grid; });
-
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Dom.js
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+var __webpack_exports__ = {};
+
+// UNUSED EXPORTS: Grid, default
+
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Dom.js
 /** @namespace */
 let Dom = {};
 
@@ -444,10 +353,10 @@ Dom.closestTagName = function(elem, tn) {
 	return null;
 };
 
-/* harmony default export */ var es6_Dom = (Dom);
+/* harmony default export */ const es6_Dom = ((/* unused pure expression or super */ null && (Dom)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Conflator.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Conflator.js
 /** Conflator is used to stop multiple executions of a function in the specified period of time by merging multiple calls into one single call. <br>
 * Conflator guarantees that only one single call will be executed.
 * @constructor
@@ -639,10 +548,10 @@ Conflator.prototype.enable = function (opt_enabled) {
 	this._disabled = opt_enabled === false;
 };
 
-/* harmony default export */ var es6_Conflator = (Conflator);
+/* harmony default export */ const es6_Conflator = ((/* unused pure expression or super */ null && (Conflator)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Ext.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Ext.js
 /** Provide ability for prototype based Class to inherits another class
 * @namespace
 * @example
@@ -693,10 +602,10 @@ Ext.inherits = function (childCtor, parentCtor) {
 	};
 };
 
-/* harmony default export */ var es6_Ext = (Ext);
+/* harmony default export */ const es6_Ext = (Ext);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/EventDispatcher.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/EventDispatcher.js
 /** Abstract base class that provides event management methods for derived class
 * @constructor
 */
@@ -856,10 +765,10 @@ let preventDefault = function(e) {
 */
 EventDispatcher.preventDefault = preventDefault;
 
-/* harmony default export */ var es6_EventDispatcher = (EventDispatcher);
+/* harmony default export */ const es6_EventDispatcher = (EventDispatcher);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/VariableToken.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/VariableToken.js
 
 /** @constructor
 * @param {string} str
@@ -1172,10 +1081,10 @@ VariableToken.prototype._resolveArray = function(str) {
 	}
 };
 
-/* harmony default export */ var formula_VariableToken = (VariableToken);
+/* harmony default export */ const formula_VariableToken = (VariableToken);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/Formula.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/Formula.js
 
 
 
@@ -2064,10 +1973,10 @@ Formula.prototype._onDataCacheChanged = function(e) {
 
 Formula._proto = Formula.prototype;
 
-/* harmony default export */ var formula_Formula = (Formula);
+/* harmony default export */ const formula_Formula = (Formula);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-en.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-en.js
 /**
 * @namespace
 */
@@ -2118,9 +2027,9 @@ let translationEn = {
 	"PM": "PM"
 };
 
-/* harmony default export */ var translation_en = (translationEn);
+/* harmony default export */ const translation_en = (translationEn);
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-de.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-de.js
 /**
 * @namespace
 */
@@ -2171,9 +2080,9 @@ let translationDe = {
 	"PM": "PM"
 };
 
-/* harmony default export */ var translation_de = (translationDe);
+/* harmony default export */ const translation_de = (translationDe);
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-ja.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-ja.js
 /**
 * @namespace
 */
@@ -2224,9 +2133,9 @@ let translationJa = {
 	'PM': '午後'
 };
 
-/* harmony default export */ var translation_ja = (translationJa);
+/* harmony default export */ const translation_ja = (translationJa);
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-zh.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-zh.js
 /**
 * @namespace
 */
@@ -2277,9 +2186,9 @@ let translationZh = {
 	'PM': '下午'
 };
 
-/* harmony default export */ var translation_zh = (translationZh);
+/* harmony default export */ const translation_zh = (translationZh);
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-zh-hant.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation-zh-hant.js
 /**
 * @namespace
 */
@@ -2330,9 +2239,9 @@ let translationZhHant = {
 	'PM': '下午'
 };
 
-/* harmony default export */ var translation_zh_hant = (translationZhHant);
+/* harmony default export */ const translation_zh_hant = (translationZhHant);
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/locale/translation.js
 
 
 
@@ -2350,9 +2259,9 @@ let translation = {
 	"zh-Hant": translation_zh_hant
 };
 
-/* harmony default export */ var locale_translation = (translation);
+/* harmony default export */ const locale_translation = (translation);
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Color.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Color.js
 /** @namespace */
 let Color = {};
 
@@ -2549,10 +2458,10 @@ Color.getContrastRatio = getContrastRatio;
 Color.getContrastColor = getContrastColor;
 Color.blendColor = blendColor;
 
-/* harmony default export */ var es6_Color = (Color);
+/* harmony default export */ const es6_Color = ((/* unused pure expression or super */ null && (Color)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Util.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Util.js
 
 
 /** @namespace */
@@ -3041,10 +2950,10 @@ let prepareTSVContent = function (data) {
 	return content;
 };
 
-/* harmony default export */ var es6_Util = (Util);
+/* harmony default export */ const es6_Util = ((/* unused pure expression or super */ null && (Util)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Deferred.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/Deferred.js
 /** Deferred promise should be used when asynchronous method does not return promise object (e.g. typical AJAX calls, or native setTimeout()). In other words, deferred promise is used to allow any non-promise logics to be worked in promise pattern.
 * @constructor
 * @param {Function=} resolveHandler
@@ -3151,10 +3060,10 @@ Deferred.prototype._finally = function() {
 	this._resolve = this._reject = null;
 };
 
-/* harmony default export */ var es6_Deferred = (Deferred);
+/* harmony default export */ const es6_Deferred = ((/* unused pure expression or super */ null && (Deferred)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/ElementObserver.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/ElementObserver.js
 
 /** @namespace
 */
@@ -3287,10 +3196,10 @@ ElementObserver._listeners = {};
 */
 ElementObserver._id = 0;
 
-/* harmony default export */ var es6_ElementObserver = (ElementObserver);
+/* harmony default export */ const es6_ElementObserver = ((/* unused pure expression or super */ null && (ElementObserver)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/ElfUtil.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/ElfUtil.js
 
 
 
@@ -3899,10 +3808,10 @@ ElfUtil._retrieveThemeColors = function(profileName) {
 	colors["trackColor"] = colors["primary"] || ElfUtil._defaultColors["trackColor"];
 };
 
-/* harmony default export */ var es6_ElfUtil = (ElfUtil);
+/* harmony default export */ const es6_ElfUtil = (ElfUtil);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/DateTime.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/DateTime.js
 
 
 
@@ -3944,7 +3853,7 @@ const SECONDS_IN_DAY = 24 * 60 * 60; // eslint-disable-line
 * @public
 * @constant
 */
-const SECONDS_IN_HOUR = 60 * 60; // eslint-disable-line
+const SECONDS_IN_HOUR = (/* unused pure expression or super */ null && (60 * 60)); // eslint-disable-line
 /** @type {number}
 * @public
 * @constant
@@ -4409,10 +4318,10 @@ DateTime.toYYYYMMDD = function(dateObj) {
 };
 
 
-/* harmony default export */ var es6_DateTime = (DateTime);
+/* harmony default export */ const es6_DateTime = (DateTime);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Info.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Info.js
 
 /**
  * @namespace Info
@@ -4603,10 +4512,10 @@ Info["ISNASTRING"] = function(value) {
 	return  0; // "abc", [1, 2, 3], 0, 1, null, undefined, NaN
 };
 
-/* harmony default export */ var functions_Info = (Info);
+/* harmony default export */ const functions_Info = (Info);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Logic.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Logic.js
 /**
  * @namespace Logic
  * @description
@@ -4781,10 +4690,10 @@ Logic["TRUE"] = function() {
 	return 1;
 };
 
-/* harmony default export */ var functions_Logic = (Logic);
+/* harmony default export */ const functions_Logic = (Logic);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Math.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Math.js
 /**
  * @namespace GridMath
  * @description
@@ -6407,10 +6316,10 @@ GridMath["TRUNC"] = function(num, num_digits) {
 	return Math.floor(num * divisor) / divisor;
 };
 
-/* harmony default export */ var functions_Math = (GridMath);
+/* harmony default export */ const functions_Math = (GridMath);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Statistics.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Statistics.js
 /**
  * @namespace Statistic
  * @description
@@ -6643,10 +6552,10 @@ Stat["STDEVP"] = function(/* ... args*/) {
 	return Math.sqrt(sum / argLen);
 };
 
-/* harmony default export */ var Statistics = (Stat);
+/* harmony default export */ const Statistics = (Stat);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Text.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/functions/Text.js
 /**
  * @namespace Text
  * @description
@@ -7319,10 +7228,10 @@ Text["STRING"] = function(num1, num2) {
 	return (num1).toFixed(num2);
 };
 
-/* harmony default export */ var functions_Text = (Text);
+/* harmony default export */ const functions_Text = (Text);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/Engine.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/formula/Engine.js
 
 
 
@@ -7913,10 +7822,10 @@ Engine.prototype._sortParentChildrenMap = function(ParentChildrenMap) {
 
 Engine._proto = Engine.prototype;
 
-/* harmony default export */ var formula_Engine = (Engine);
+/* harmony default export */ const formula_Engine = ((/* unused pure expression or super */ null && (Engine)));
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/util.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/util.js
 /**
 * @namespace
 */
@@ -8306,10 +8215,10 @@ util_Util._preventDefault = function (e) {
 	e.stopPropagation();
 };
 
-/* harmony default export */ var util = (util_Util);
+/* harmony default export */ const util = (util_Util);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/event/EventListeners.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/event/EventListeners.js
 
 
 /** @constructor
@@ -8474,10 +8383,10 @@ EventListeners.prototype._dispatching = false;
 
 EventListeners._proto = EventListeners.prototype; // To allow compression of prototype keyword
 
-/* harmony default export */ var event_EventListeners = (EventListeners);
+/* harmony default export */ const event_EventListeners = (EventListeners);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/event/EventDispatcher.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/event/EventDispatcher.js
 
 
 /** Abstract base class that provides event management methods for derived class
@@ -8614,10 +8523,10 @@ EventDispatcher_EventDispatcher.prototype._dispatch = function (type, eventArg)
 
 EventDispatcher_EventDispatcher._proto = EventDispatcher_EventDispatcher.prototype;
 
-/* harmony default export */ var event_EventDispatcher = (EventDispatcher_EventDispatcher);
+/* harmony default export */ const event_EventDispatcher = (EventDispatcher_EventDispatcher);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/DataCache.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/DataCache.js
 
 
 
@@ -9213,10 +9122,10 @@ DataCache.constructTable = function (dataset, opt_options, opt_rowIds) {
 };
 
 
-/* harmony default export */ var data_DataCache = (DataCache);
+/* harmony default export */ const data_DataCache = (DataCache);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/Segment.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/Segment.js
 
 
 
@@ -9229,6 +9138,9 @@ let Segment = function(rid, sharedObj) {
 	this._rid = rid;
 	this._children = {};
 	this._shared = sharedObj;
+	if(sharedObj.defaultCollapsing) {
+		this._collapsed = true;
+	}
 };
 es6_Ext.inherits(Segment, es6_EventDispatcher);
 
@@ -9343,9 +9255,12 @@ Segment.prototype.dispose = function() {
 		this._subSegMap = this._subSegNames = null;
 	}
 	if(this._collapsed) {
-		this._shared.dirtyCollapsingState = true;
+		if(this._childCount || this._subSegDef) {
+			this._shared.dirtyCollapsingState = true;
+		}
 	}
 
+	this._childCount = 0;
 	this._shared = null;
 	this._subSegParent = this._subSegDef = this._subSegVal = null;
 };
@@ -9846,7 +9761,9 @@ Segment.prototype.collapse = function(bool) {
 	bool = (bool !== false);
 	if(this._collapsed !== bool) {
 		this._collapsed = bool;
-		this._shared.dirtyCollapsingState = true;
+		if(this._childCount || this._subSegDef) {
+			this._shared.dirtyCollapsingState = true;
+		}
 		return true;
 	}
 	return false;
@@ -9953,10 +9870,14 @@ Segment.prototype.setOrder = function(val) {
 */
 Segment._tabs = null;
 /** @public
-* @param {Array.<string>} lines
-* @return {Array.<string>} lines
+* @param {Array.<string>=} lines
+* @return {!Array.<string>} lines
 */
 Segment.prototype.log = function(lines) {
+	if(!lines) {
+		lines = [];
+	}
+
 	let i;
 	let tabs = Segment._tabs;
 	if(!tabs) {
@@ -9988,10 +9909,10 @@ Segment.prototype.log = function(lines) {
 };
 
 
-/* harmony default export */ var data_Segment = (Segment);
+/* harmony default export */ const data_Segment = (Segment);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/SegmentCollection.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/SegmentCollection.js
 
 
 
@@ -10009,7 +9930,8 @@ let SegmentCollection = function() {
 
 	this._shared = {
 		childToSegment: {}, // child Id to segment Id
-		dirtyCollapsingState: false
+		dirtyCollapsingState: false,
+		defaultCollapsing: false
 	};
 };
 es6_Ext.inherits(SegmentCollection, es6_EventDispatcher);
@@ -10208,19 +10130,17 @@ SegmentCollection.prototype.getSegmentIds = function() {
 * @return {boolean} Returns true if there is any change. Otherwise, returns false
 */
 SegmentCollection.prototype.collapseSegments = function(segmentIds, bool) {
+	let dirty = 0;
 	if(this._segmentCount) {
-		let dirty = 0;
 		let len = segmentIds.length;
 		for (let i = 0; i < len; i++) {
-			let rowId = segmentIds[i];
-			dirty |= this._segments[rowId].collapse(bool);
-
-		}
-		if(dirty) {
-			return true;
+			let segment = this._segments[segmentIds[i]];
+			if(segment) {
+				dirty |= segment.collapse(bool);
+			}
 		}
 	}
-	return false;
+	return dirty ? true : false;
 };
 
 /** @public
@@ -10541,7 +10461,6 @@ SegmentCollection.prototype.logRowIdMap = function() {
 	return lines.join("\n");
 };
 
-
 /** @public
 * @param {string} segmentId
 * @param {string|Array.<string>} fields
@@ -10632,11 +10551,24 @@ SegmentCollection.prototype._onSubSegmentRemoved = function(e) {
 	this.removeSegment(rid);
 };
 
+/** @public
+* @param {boolean} bool
+* @return {boolean}
+*/
+SegmentCollection.prototype.setDefaultCollapsing = function(bool) {
+	let newVal = bool ? true : false;
+	if(this._shared.defaultCollapsing !== newVal) {
+		this._shared.defaultCollapsing = newVal;
+		return true;
+	}
+	return false;
+};
 
-/* harmony default export */ var data_SegmentCollection = (SegmentCollection);
 
+/* harmony default export */ const data_SegmentCollection = (SegmentCollection);
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/DataTable.js
+
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/DataTable.js
 
 
 
@@ -10730,6 +10662,10 @@ DataTable.prototype._clsSource = null;
 * @type {number}
 */
 DataTable.prototype._classifyingTimer = 0;
+/** @private
+* @type {boolean}
+*/
+DataTable.prototype._segmentDefaultCollapsing = false;
 
 
 /** @typedef {Function} DataTable~SortLogic
@@ -11642,6 +11578,15 @@ DataTable.prototype.isFrozen = function() {
 	return this._frozen;
 };
 
+/** @private
+*/
+DataTable.prototype._initSegmentCollection = function() {
+	if (!this._segments) {
+		this._segments = new data_SegmentCollection();
+		this._segments.setDefaultCollapsing(this._segmentDefaultCollapsing);
+		this._segments.addEventListener("subSegmentChanged", this._onSubSegmentChanged);
+	}
+};
 /**
 * @public
 * @param {Array.<string>} rids
@@ -11656,10 +11601,7 @@ DataTable.prototype.setSegmentSeparators = function(rids, enabled) {
 		for (let i = 0; i < len; i++) {
 			if(enabled !== false) {
 				let rid = rids[i];
-				if (!this._segments) {
-					this._segments = new data_SegmentCollection();
-					this._segments.addEventListener("subSegmentChanged", this._onSubSegmentChanged);
-				}
+				this._initSegmentCollection();
 				if(this._autoSegmentFilling) {
 					let parentId = this._segments.getParentRowId(rid);
 					if(parentId) {
@@ -11703,10 +11645,7 @@ DataTable.prototype.setSegmentSeparator = function(rid, enabled) {
 	let memberCount = 0;
 	if(rid && typeof rid === "string") {
 		if(enabled !== false) {
-			if(!this._segments) {
-				this._segments = new data_SegmentCollection();
-				this._segments.addEventListener("subSegmentChanged", this._onSubSegmentChanged);
-			}
+			this._initSegmentCollection();
 			if(this._autoSegmentFilling) {
 				let parentId = this._segments.getParentRowId(rid);
 				if(parentId) {
@@ -11770,6 +11709,13 @@ DataTable.prototype.hasSegmentation = function() {
 };
 /**
 * @public
+* @return {boolean}
+*/
+DataTable.prototype.hasSegmentClassification = function() {
+	return this._segments ? this._segments.hasClassification() : false;
+};
+/**
+* @public
 * @param {string} rid
 * @return {boolean}
 */
@@ -12266,6 +12212,22 @@ DataTable.prototype._onSubSegmentChanged = function(e) {
 	}
 };
 
+/**
+* @public
+* @param {boolean} bool
+* @return {boolean}
+*/
+DataTable.prototype.setSegmentDefaultCollapsing = function(bool) {
+	if(this._segmentDefaultCollapsing !== bool) {
+		this._segmentDefaultCollapsing = bool;
+		if(this._segments) {
+			this._segments.setDefaultCollapsing(bool);
+		}
+		return true;
+	}
+	return false;
+};
+
 
 /**
 * @public
@@ -12799,10 +12761,10 @@ DataTable._getSortOrder = function(sortOrder) {
 
 DataTable._proto = DataTable.prototype;
 
-/* harmony default export */ var data_DataTable = (DataTable);
+/* harmony default export */ const data_DataTable = (DataTable);
 
 
-// CONCATENATED MODULE: ./src/js/RowDefinition.js
+;// CONCATENATED MODULE: ./src/js/RowDefinition.js
 
 /* eslint-disable */
 
@@ -13408,20 +13370,28 @@ RowDefinition.prototype.getType = function() {
 * @public
 * @param {DataCache} dataSource
 * @param {Object=} subs Quotes2 subscription object
+* @return {boolean} Returns true if there is an data update
 */
 RowDefinition.prototype.setDataSource = function(dataSource, subs) {
 	this._dc = dataSource || null;
-
+	let dataUpdated = false;
 	if(this._dc) {
-		this.setRowData({}); // Trigger data change
 		if(this._staticValues) {
-			this.setRowData(this._staticValues); // Trigger dataComposed and add updates
+			let rowData = _cloneObject(this._staticValues);
+			dataUpdated = this.addUpdate(rowData);
+			this._dc.setRowData(this._rowId, rowData, {
+				"rowDef": this, // The _onDataChanged and _onDataComposed handlers cannot get rowDef from DT because row does not register to view yet.
+				"initialChanges": this.getUpdates() // Used by _onDataComposed to keep backward compatibility.
+			}); // Trigger dataComposed and add updates
+		} else {
+			this._dc.setRowData(this._rowId, {});
 		}
 	}
 
 	this._subs = subs || null;
 	// This will work for runtime row insertion, but not for first initilization.
 	this.subscribeForUpdates();
+	return dataUpdated;
 };
 /** @public
 * @return {DataCache} dataSource
@@ -14272,9 +14242,9 @@ RowDefinition.dispose = function(rowDef) {
 };
 
 
-/* harmony default export */ var js_RowDefinition = (RowDefinition);
+/* harmony default export */ const js_RowDefinition = ((/* unused pure expression or super */ null && (RowDefinition)));
 
-// CONCATENATED MODULE: ./src/js/FieldDefinition.js
+;// CONCATENATED MODULE: ./src/js/FieldDefinition.js
 // TODO: Merge this with Fields in mobile-mon repository
 /* eslint-disable */
 
@@ -14834,9 +14804,9 @@ function onLoadEnd(e) {
 })();
 
 
-/* harmony default export */ var js_FieldDefinition = (FieldDefinition);
+/* harmony default export */ const js_FieldDefinition = (FieldDefinition);
 
-// CONCATENATED MODULE: ./src/js/PredefinedFormula.js
+;// CONCATENATED MODULE: ./src/js/PredefinedFormula.js
 
 /* @constructor */
 let PredefinedFormula = {};
@@ -14869,9 +14839,9 @@ PredefinedFormula.remove = function(field) {
 };
 
 
-/* harmony default export */ var js_PredefinedFormula = (PredefinedFormula);
+/* harmony default export */ const js_PredefinedFormula = (PredefinedFormula);
 
-// CONCATENATED MODULE: ./src/js/ColumnDefinition.js
+;// CONCATENATED MODULE: ./src/js/ColumnDefinition.js
 /* eslint-disable */
 
 
@@ -16074,9 +16044,9 @@ ColumnDefinition.prototype.setBackgroundColor = function(color) {
 };
 
 
-/* harmony default export */ var js_ColumnDefinition = (ColumnDefinition);
+/* harmony default export */ const js_ColumnDefinition = (ColumnDefinition);
 
-// CONCATENATED MODULE: ./src/js/SnapshotFiller.js
+;// CONCATENATED MODULE: ./src/js/SnapshotFiller.js
 /* eslint-disable */
 
 
@@ -16613,9 +16583,9 @@ SnapshotFiller.prototype._onRTKTimeSeriesSuccess = function (fields, serverResul
 };
 
 
-/* harmony default export */ var js_SnapshotFiller = (SnapshotFiller);
+/* harmony default export */ const js_SnapshotFiller = (SnapshotFiller);
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/GroupDefinitions.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/GroupDefinitions.js
 
 
 /** @constructor
@@ -17256,10 +17226,10 @@ GroupDefinitions.prototype.setGroupName = function (groupId, groupName) {
 	return false;
 };
 
-/* harmony default export */ var es6_GroupDefinitions = (GroupDefinitions);
+/* harmony default export */ const es6_GroupDefinitions = ((/* unused pure expression or super */ null && (GroupDefinitions)));
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/ElementWrapper.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/ElementWrapper.js
 
 
 
@@ -17698,12 +17668,16 @@ ElementWrapper.prototype.getClass = function () { return this._element.className
 */
 ElementWrapper.prototype.setClass = function (str) { this._element.className = str; };
 
-/**
-* @public
+/** @public
 * @param {string} str
 * @return {string}
 */
 ElementWrapper.prototype.getAttribute = function (str) { return this._element.getAttribute(str); };
+/** @public
+* @param {string} str
+* @return {boolean}
+*/
+ElementWrapper.prototype.hasAttribute = function (str) { return this._element.hasAttribute(str); };
 /** Sets attribute to DOM element
 * @public
 * @param {string} str
@@ -17972,10 +17946,10 @@ ElementWrapper.prototype.isEndOfVerticalScroll = function () { return this._elem
 
 ElementWrapper._proto = ElementWrapper.prototype;
 
-/* harmony default export */ var components_ElementWrapper = (ElementWrapper);
+/* harmony default export */ const components_ElementWrapper = (ElementWrapper);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/CellFloatingPanel.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/CellFloatingPanel.js
 /* eslint-disable */
 
 
@@ -18104,10 +18078,10 @@ CellFloatingPanel.prototype._updatePanelItems = function() {
 	}
 };
 
-/* harmony default export */ var components_CellFloatingPanel = (CellFloatingPanel);
+/* harmony default export */ const components_CellFloatingPanel = (CellFloatingPanel);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/Cell.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/Cell.js
 /* eslint-disable */
 
 
@@ -18849,11 +18823,17 @@ Cell.prototype.updateTooltip = function() {
 	}
 
 	if(customizedTooltip) {
-		if(this.getAttribute("title") !== customizedTooltip) {
+		let curTooltip = this.hasAttribute("tooltip") ? this.getAttribute("tooltip") : this.getAttribute("title");
+		if(curTooltip !== customizedTooltip) {
 			this.setAttribute("title", customizedTooltip);
 		}
-	} else if(this.getAttribute("title") != null) {
-		this.removeAttribute("title");
+	} else {
+		if(this.hasAttribute("title")) {
+			this.removeAttribute("title");
+		}
+		if(this.hasAttribute("tooltip")) {
+			this.removeAttribute("tooltip");
+		}
 	}
 };
 /** @public
@@ -18926,10 +18906,10 @@ Cell.prototype._updateDisplay = function () {
 
 Cell._proto = Cell.prototype;
 
-/* harmony default export */ var components_Cell = (Cell);
+/* harmony default export */ const components_Cell = (Cell);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/TrackLayout.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/TrackLayout.js
 
 
 /** TrackLayout is like a running track in a football field which contains multiple lanes.
@@ -19830,10 +19810,10 @@ TrackLayout.prototype.copyFrom = function (src, offset) {
 	}
 };
 
-/* harmony default export */ var util_TrackLayout = (TrackLayout);
+/* harmony default export */ const util_TrackLayout = (TrackLayout);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/ILayoutGrid.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/ILayoutGrid.js
 /* eslint-disable */
 
 
@@ -20538,10 +20518,10 @@ ILayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx)
 */
 ILayoutGrid.prototype.updateColumnSeparators = function () {};
 
-/* harmony default export */ var grid_ILayoutGrid = (ILayoutGrid);
+/* harmony default export */ const grid_ILayoutGrid = ((/* unused pure expression or super */ null && (ILayoutGrid)));
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/Column.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/Column.js
 /* eslint-disable */
 
 
@@ -21158,10 +21138,10 @@ Column.prototype.setScrollState = function (pane, slider, absolutePos) {
 
 Column._proto = Column.prototype;
 
-/* harmony default export */ var components_Column = (Column);
+/* harmony default export */ const components_Column = (Column);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/VirtualItems.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/VirtualItems.js
 
 
 /** @constructor
@@ -21211,10 +21191,10 @@ VirtualItems.prototype.moveItemsToTop = function (numItems) {
 	this._items = util.cycleArray(this._items, numItems);
 };
 
-/* harmony default export */ var components_VirtualItems = (VirtualItems);
+/* harmony default export */ const components_VirtualItems = (VirtualItems);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/StretchedCells.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/StretchedCells.js
 
  // eslint-disable-line
  // eslint-disable-line
@@ -21555,10 +21535,10 @@ StretchedCells.prototype.moveCellsToTop = function (numCells) {
 	}
 };
 
-/* harmony default export */ var components_StretchedCells = (StretchedCells);
+/* harmony default export */ const components_StretchedCells = (StretchedCells);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/CellSpan.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/CellSpan.js
 
 /** @constructor
 * @param {number} x
@@ -21656,10 +21636,10 @@ CellSpan.prototype.prevRowSpan = 1;
 */
 CellSpan.prototype.retVal = 0;
 
-/* harmony default export */ var components_CellSpan = (CellSpan);
+/* harmony default export */ const components_CellSpan = (CellSpan);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/CellSpans.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/CellSpans.js
 
 
 /** @constructor */
@@ -22025,11 +22005,11 @@ CellSpans.prototype._occupiedMap;
 */
 CellSpans.prototype._frozenMapping = false;
 
-/* harmony default export */ var components_CellSpans = (CellSpans);
+/* harmony default export */ const components_CellSpans = (CellSpans);
 
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/SelectionList.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/SelectionList.js
 
 /** @constructor
 * @ignore
@@ -22519,10 +22499,10 @@ SelectionList.prototype._firstIndex = -1;
 SelectionList.prototype._lastIndex = -1;
 //#endregion
 
-/* harmony default export */ var util_SelectionList = (SelectionList);
+/* harmony default export */ const util_SelectionList = (SelectionList);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/Reverter.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/Reverter.js
 
 /** @description Reverter is used executed the given method after the specified delay. If Reverter is activated the second time within the delay, the delay time will be extended.
 * @constructor
@@ -22600,10 +22580,10 @@ Reverter.prototype._onInterval = function () {
 
 Reverter._proto = Reverter.prototype;
 
-/* harmony default export */ var util_Reverter = (Reverter);
+/* harmony default export */ const util_Reverter = (Reverter);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/Scrollbar.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/Scrollbar.js
 /* eslint-disable */
 
 
@@ -24015,10 +23995,10 @@ Scrollbar.prototype.restoreTrackPosition = function () {
 
 Scrollbar._proto = Scrollbar.prototype;
 
-/* harmony default export */ var components_Scrollbar = (Scrollbar);
+/* harmony default export */ const components_Scrollbar = (Scrollbar);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/HScrollbar.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/HScrollbar.js
 /* eslint-disable */
 
 
@@ -24258,10 +24238,10 @@ HScrollbar.prototype._updateActivation = function (bool) {
 
 HScrollbar._proto = HScrollbar.prototype;
 
-/* harmony default export */ var components_HScrollbar = (HScrollbar);
+/* harmony default export */ const components_HScrollbar = (HScrollbar);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/CellBoundPainter.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/CellBoundPainter.js
 /** @private
 * @function
 * @param {number} idx
@@ -24431,10 +24411,10 @@ CellBoundPainter.prototype.updateCellBounds = function() {
 
 CellBoundPainter._proto = CellBoundPainter.prototype;
 
-/* harmony default export */ var util_CellBoundPainter = (CellBoundPainter);
+/* harmony default export */ const util_CellBoundPainter = (CellBoundPainter);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/LayoutGrid.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/LayoutGrid.js
 /* eslint-disable */
 
 
@@ -24699,10 +24679,6 @@ LayoutGrid.prototype._colBounds = null;
 * @private
 */
 LayoutGrid.prototype._colBoundCache = null;
-/** @type {boolean}
-* @private
-*/
-LayoutGrid.prototype._colSelDirty = false;
 /** @type {HScrollbar}
 * @private
 */
@@ -24737,7 +24713,6 @@ LayoutGrid.prototype.dispose = function () {
 
 	this._colCount = this._rowCount = this._activeRowEnd = this._availableRowCount = 0;
 	this._colBounds = this._colBoundCache = null;
-	this._colSelDirty = false;
 
 	this._highlightedCells.length = 0;
 	this._ctx = null;
@@ -26448,7 +26423,7 @@ LayoutGrid.prototype._calculateViewSize = function (forceRecal) {
 	if(!stretchSize && ctx) {
 		if(ctx["getWidth"]) {
 			let contentWidth = this.getContentWidth();
-			stretchSize = ctx["getWidth"]();
+			stretchSize = ctx["getWidth"]() - this._rightSpaceSize;
 			if(stretchSize) { // Grid may not be in the document
 				if(contentWidth < stretchSize) { // If view width is larger than actual content
 					stretchSize = contentWidth;
@@ -26684,8 +26659,6 @@ LayoutGrid.prototype.selectColumn = function (colIndex, selected) {
 	this.enableColumnClass(colIndex, "selected-column", selected);
 
 	if(selected) {
-		this._colSelDirty = true;
-
 		let boundLayer = this._boundLayer;
 		if(!boundLayer) {
 			this._initBoundLayer();
@@ -26813,10 +26786,6 @@ LayoutGrid.prototype.calculateColumnBounds = function (lftIdx, rgtIdx, outPositi
 * @param {number=} topPx Top position of bound
 */
 LayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx) {
-	if(!this._colSelDirty) {
-		return;
-	}
-
 	let cbs = this._colBounds;
 	let cbc = this._colBoundCache;
 	if(!cbs) {
@@ -26843,7 +26812,6 @@ LayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx)
 	cbs.length = activeCount = rangeCount;
 
 	if(!rangeCount) {
-		this._colSelDirty = false;
 		return;
 	}
 
@@ -26930,7 +26898,7 @@ LayoutGrid.prototype.updateColumnSeparators = function () {
 		let colWidth = this._trackX.getLaneEnd(colCount - 1) - this._trackX.getLaneStart(colCount - pinnedRightCount);
 		let viewSize = this._getViewSize();
 
-		colSeparator.style.left = (viewSize - colWidth - this._rightSpaceSize) + "px";
+		colSeparator.style.left = (viewSize - colWidth) + "px";
 		colSeparator.style.height = this._trackY.getTrackSize() + "px";
 	} else {
 		if (colSeparator && colSeparator.parentNode) {
@@ -27328,6 +27296,20 @@ LayoutGrid.prototype._onMouseOut = function (e) {
 	this.setRowHighlight(-1);
 };
 
+
+/** @public
+* @ignore
+* @return {!Object}
+*/
+LayoutGrid.prototype._getEventHandlers = function () {
+	return {
+		"mouseout": this._onMouseOut,
+		"mousemove": this._onMouseMove
+	};
+};
+
+
+
 /**
  * @private
  * @param {number} rowIndex
@@ -27406,10 +27388,10 @@ LayoutGrid.prototype._onResetTransformIE = function () {
 
 LayoutGrid._proto = LayoutGrid.prototype;
 
-/* harmony default export */ var grid_LayoutGrid = (LayoutGrid);
+/* harmony default export */ const grid_LayoutGrid = (LayoutGrid);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/ColumnStats.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/ColumnStats.js
 
 /** @constructor
 * @param {*=} source
@@ -27836,10 +27818,10 @@ ColumnStats.prototype._colDataGetter = null;
 ColumnStats.prototype._refs;
 //#endregion Private
 
-/* harmony default export */ var data_ColumnStats = (ColumnStats);
+/* harmony default export */ const data_ColumnStats = (ColumnStats);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/WrappedView.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/WrappedView.js
 
 
  // eslint-disable-line
@@ -29158,10 +29140,10 @@ WrappedView.prototype.isRowFiltered = function(rid, rowData) {
 	return this._dv.isRowFiltered(rid, rowData);
 };
 
-/* harmony default export */ var data_WrappedView = (WrappedView);
+/* harmony default export */ const data_WrappedView = (WrappedView);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/DataView.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/DataView.js
 
 
 
@@ -31910,6 +31892,14 @@ DataView.prototype.enableSeparatorFiltering = function (enabled) {
 DataView.prototype.setSegmentClassification = function(segmentRef, fields) {
 	return this._dt.setSegmentClassification(this._toRowId(segmentRef), fields);
 };
+/**
+* @public
+* @param {boolean} bool
+* @return {boolean}
+*/
+DataView.prototype.setSegmentDefaultCollapsing = function(bool) {
+	return this._dt.setSegmentDefaultCollapsing(bool);
+};
 
 /** @public
 * @ignore
@@ -33284,10 +33274,10 @@ DataView._defaultGroupSortingLogic = function(strA, strB) {
 };
 
 
-/* harmony default export */ var data_DataView = (DataView);
+/* harmony default export */ const data_DataView = (DataView);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/Conflator.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/Conflator.js
 
 /** @description Conflator is used to stop multiple executions of a function in the specified period of time by merging multiple calls into one single call.
 * Conflator guarantees that only one single call will be executed.
@@ -33477,10 +33467,10 @@ Conflator_Conflator.prototype.enable = function (opt_enabled) {
 
 Conflator_Conflator._proto = Conflator_Conflator.prototype;
 
-/* harmony default export */ var util_Conflator = (Conflator_Conflator);
+/* harmony default export */ const util_Conflator = (Conflator_Conflator);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/SectionSettings.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/SectionSettings.js
 /* eslint-disable */
 
 
@@ -34158,10 +34148,10 @@ SectionSettings.prototype._calculateChangeIndices = function () {
 
 SectionSettings._proto = SectionSettings.prototype;
 
-/* harmony default export */ var util_SectionSettings = (SectionSettings);
+/* harmony default export */ const util_SectionSettings = (SectionSettings);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/Virtualizer.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/Virtualizer.js
 
 
  // eslint-disable-line
@@ -34500,10 +34490,10 @@ Virtualizer.prototype.validateVirtualization = function () {
 
 Virtualizer._proto = Virtualizer.prototype;
 
-/* harmony default export */ var util_Virtualizer = (Virtualizer);
+/* harmony default export */ const util_Virtualizer = (Virtualizer);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/VScrollbar.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/VScrollbar.js
 /* eslint-disable */
 
 
@@ -34641,10 +34631,10 @@ VScrollbar.prototype._onScroll = function (e) {
 
 VScrollbar._proto = VScrollbar.prototype;
 
-/* harmony default export */ var components_VScrollbar = (VScrollbar);
+/* harmony default export */ const components_VScrollbar = (VScrollbar);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/VirtualizedLayoutGrid.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/VirtualizedLayoutGrid.js
 /* eslint-disable */
 
 
@@ -35889,10 +35879,10 @@ VirtualizedLayoutGrid.prototype._getContext = function () {
 
 VirtualizedLayoutGrid._proto = VirtualizedLayoutGrid.prototype;
 
-/* harmony default export */ var grid_VirtualizedLayoutGrid = (VirtualizedLayoutGrid);
+/* harmony default export */ const grid_VirtualizedLayoutGrid = (VirtualizedLayoutGrid);
 
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/Core.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/Core.js
 
  // eslint-disable-line
 
@@ -36516,7 +36506,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.129";
+	return "5.1.135";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -37963,7 +37953,7 @@ Core.prototype._deserializeColumn = function (index, jsonObj) {
 		this.setColumnData(index, value);
 	}
 
-	let formatter = jsonObj["formatter"] || jsonObj["binding"]; // support both composite and real-time grid
+	let formatter = jsonObj["binding"] || jsonObj["formatter"]; // support both composite and real-time grid, binding have piority first
 	if(Array.isArray(formatter)) {
 		formatter = formatter[0]; // Support only one formatter in the array
 	}
@@ -38247,21 +38237,45 @@ Core.prototype.setColumnBackgroundColor = function(colIndex, color) {
 		}
 
 		if(settings.getType() !== "content") {
-			let rowCount = section.getRowCount();
-			for(let r = 0; r < rowCount; r++) {
-				let cellSpan = section.getCellColSpan(colIndex, r);
-				if(cellSpan > 1) { continue; }
-				let cell = section.getCell(colIndex, r);
-				if(cell) {
-					cell.setStyle("backgroundColor", color);
-				}
-			}
+			this._applyCellsBackgroundColor(section, colIndex, color);
 		} else {
 			let column = section.getColumn(colIndex);
 			column.setStyle("backgroundColor", color);
 		}
 	}
 };
+/** @private
+* @param {ILayoutGrid} section
+* @param {number} colIndex
+* @param {string} color
+*/
+Core.prototype._applyCellsBackgroundColor = function(section, colIndex, color) {
+	let rowCount = section.getRowCount();
+	for(let r = 0; r < rowCount; r++) {
+		let cellSpan = section.getCellColSpan(colIndex, r);
+		if(cellSpan > 1) { continue; }
+		let cell = section.getCell(colIndex, r);
+		if(cell) {
+			cell.setStyle("backgroundColor", color);
+		}
+	}
+};
+/** @public
+* @ignore
+* @param {ILayoutGrid} section
+*/
+Core.prototype.applyColumnsBackgroundColor = function(section) {
+	if(!section) {
+		return;
+	}
+
+	let colCount = section.getColumnCount();
+	for(let c = 0; c < colCount; c++) {
+		let colDef = this._getColumnDef(c);
+		let color = colDef["backgroundColor"] || "";
+		this._applyCellsBackgroundColor(section, c, color);
+	}
+};
 
 /** @public
 * @param {number} colIndex
@@ -41519,6 +41533,11 @@ Core.prototype._onRowCountChanged = function (e) {
 
 	this._updateColumnSeparators();
 	if(prevRowCount < newRowCount) {
+		// Apply column background color
+		let settings = this.getSectionSettings(section);
+		if(settings.getType() !== "content") {
+			this.applyColumnsBackgroundColor(section);
+		}
 		this._dispatch("rowAdded", e);
 	} else if(prevRowCount > newRowCount) {
 		this._dispatch("rowRemoved", e);
@@ -42052,10 +42071,10 @@ Core.prototype._updateVScrollbar = function() {
 
 Core._proto = Core.prototype;
 
-/* harmony default export */ var grid_Core = (Core);
+/* harmony default export */ const grid_Core = ((/* unused pure expression or super */ null && (Core)));
 
 
-// CONCATENATED MODULE: ./src/js/StyleLoader.js
+;// CONCATENATED MODULE: ./src/js/StyleLoader.js
 /* eslint-disable */
 
 
@@ -42102,9 +42121,9 @@ StyleLoader.applyStyle = function (grid) {
 };
 
 
-/* harmony default export */ var js_StyleLoader = (StyleLoader);
+/* harmony default export */ const js_StyleLoader = (StyleLoader);
 
-// CONCATENATED MODULE: ./src/js/ReferenceCounter.js
+;// CONCATENATED MODULE: ./src/js/ReferenceCounter.js
 /** @constructor
 */
 let ReferenceCounter = function() {
@@ -42355,9 +42374,9 @@ ReferenceCounter.prototype.log = function() {
 
 
 
-/* harmony default export */ var js_ReferenceCounter = (ReferenceCounter);
+/* harmony default export */ const js_ReferenceCounter = (ReferenceCounter);
 
-// CONCATENATED MODULE: ./src/js/DataConnector.js
+;// CONCATENATED MODULE: ./src/js/DataConnector.js
 
 
 
@@ -42647,9 +42666,9 @@ DataConnector.prototype.reset = function () {
 };
 
 
-/* harmony default export */ var js_DataConnector = (DataConnector);
+/* harmony default export */ const js_DataConnector = (DataConnector);
 
-// CONCATENATED MODULE: ./src/js/RowDefSorter.js
+;// CONCATENATED MODULE: ./src/js/RowDefSorter.js
 
 
 /** @private
@@ -42880,9 +42899,9 @@ RowDefSorter.prototype._multiColumnsSorter = function(rowDefA, rowDefB, primaryO
 	return 0;
 };
 
-/* harmony default export */ var js_RowDefSorter = (RowDefSorter);
+/* harmony default export */ const js_RowDefSorter = (RowDefSorter);
 
-// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/plugins/SortableTitlePlugin.js
+;// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/plugins/SortableTitlePlugin.js
 /* eslint-disable */
 
 
@@ -44827,10 +44846,10 @@ SortableTitlePlugin.prototype._isCellSortable = function (section, colIndex, row
 
 SortableTitlePlugin._proto = SortableTitlePlugin.prototype;
 
-/* harmony default export */ var plugins_SortableTitlePlugin = (SortableTitlePlugin);
+/* harmony default export */ const plugins_SortableTitlePlugin = ((/* unused pure expression or super */ null && (SortableTitlePlugin)));
 
 
-// CONCATENATED MODULE: ./src/js/Grid.js
+;// CONCATENATED MODULE: ./src/js/Grid.js
 /* eslint-disable */
 
 
@@ -45145,7 +45164,7 @@ let _clearTimeout = function(id) {
 * @param {(Element|null)=} placeholder
 * @param {Grid~GridOptions=} config
 */
-let Grid = function(placeholder, config) {
+let Grid_Grid = function(placeholder, config) {
 	let t = this; // This is to primarily reduce file size
 
 	t._onDataChanged = t._onDataChanged.bind(t);
@@ -45281,179 +45300,183 @@ let Grid = function(placeholder, config) {
 
 	js_StyleLoader.applyStyle(t._grid);
 };
-Ext.inherits(Grid, EventDispatcher);
+Ext.inherits(Grid_Grid, EventDispatcher);
 
 /** @private
  * @type {Element}
  */
-Grid.prototype._topNode = null;
+Grid_Grid.prototype._topNode = null;
 /** @private
  * @type {Grid}
  */
-Grid.prototype._mainGrid = null;
+Grid_Grid.prototype._mainGrid = null;
 /** @private
  * @type {Core}
  */
-Grid.prototype._grid = null;
+Grid_Grid.prototype._grid = null;
 /** Store all actual data including streaming data, ADC data, snapshot data, user input data.
  * @type {DataCache}
  * @private
  */
-Grid.prototype._dc = null;
+Grid_Grid.prototype._dc = null;
 /** Used for hiding and filtering out rows. Always have greater or equal number of rows than that in grid
  * @type {DataTable}
  * @private
  */
-Grid.prototype._dt = null;
+Grid_Grid.prototype._dt = null;
 /** Used for sorting. Number of rows is always the same as that in grid
  * @type {DataView}
  * @private
  */
-Grid.prototype._dv = null;
+Grid_Grid.prototype._dv = null;
 /** @type {boolean}
  * @private
  */
-Grid.prototype._sharedDataSource = false;
+Grid_Grid.prototype._sharedDataSource = false;
 /** @type {boolean}
  * @private
  */
-Grid.prototype._sharedSorter = false;
+Grid_Grid.prototype._sharedSorter = false;
 
 /** JET/RTK's Quotes2 subscription object
  * @type {Object}
  * @private
  */
-Grid.prototype._subs = null;
+Grid_Grid.prototype._subs = null;
 
 /** @type {SortableTitlePlugin}
  * @private
  */
-Grid.prototype._stp = null;
+Grid_Grid.prototype._stp = null;
 /** @type {Function}
  * @private
  */
-Grid.prototype._columnSorter = null;
+Grid_Grid.prototype._columnSorter = null;
 
 /** @private
 * @type {Conflator}
 */
-Grid.prototype._dcConflator = null;
+Grid_Grid.prototype._dcConflator = null;
 /** @private
 * @type {SnapshotFiller}
 */
-Grid.prototype._snapshot = null;
+Grid_Grid.prototype._snapshot = null;
 /** @private
 * @type {DataConnector}
 */
-Grid.prototype._connector = null;
+Grid_Grid.prototype._connector = null;
 /** @private
 * @type {RowDefSorter}
 */
-Grid.prototype._sorter = null;
+Grid_Grid.prototype._sorter = null;
 
 /** @private
 * @type {Engine}
 */
-Grid.prototype._fnEngine = null;
+Grid_Grid.prototype._fnEngine = null;
 /** @private
 * @type {Conflator}
 */
-Grid.prototype._formulaConflator = null;
+Grid_Grid.prototype._formulaConflator = null;
 
 /** @private
 * @type {Conflator}
 */
-Grid.prototype._chainConflator = null;
+Grid_Grid.prototype._chainConflator = null;
 /** @private
 * @type {Object}
 */
-Grid.prototype._constituentMap = null;
+Grid_Grid.prototype._constituentMap = null;
 /** @private
 * @type {number}
 */
-Grid.prototype._clientWidth = NaN;
+Grid_Grid.prototype._clientWidth = NaN;
 /** @private
 * @type {number}
 */
-Grid.prototype._autoLayoutTimer = 0;
+Grid_Grid.prototype._autoLayoutTimer = 0;
 /** @private
  * @type {ColumnDefinition~Options}
  */
-Grid.prototype._defaultColumnOptions = null;
+Grid_Grid.prototype._defaultColumnOptions = null;
 /** @private
 * @type {*}
 */
-Grid.prototype._RTK = null;
+Grid_Grid.prototype._RTK = null;
 /** @private
 * @type {Grid~ADCOptions}
 */
-Grid.prototype._ADCOptions = null;
+Grid_Grid.prototype._ADCOptions = null;
 /** use for synapse service
 * @private
 * @type {string}
 */
-Grid.prototype._synapse = null;
+Grid_Grid.prototype._synapse = null;
 /** @private
 * @type {boolean}
 */
-Grid.prototype._autoDateConversion = false;
+Grid_Grid.prototype._autoDateConversion = false;
 /** @private
 * @type {boolean}
 */
-Grid.prototype._textSelect = false;
+Grid_Grid.prototype._textSelect = false;
 /** @type {string}
 * @private
 */
-Grid.prototype._lang = null;
+Grid_Grid.prototype._lang = null;
 /** @type {Object}
 * @private
 */
-Grid.prototype._dateTimeUtil = null;
+Grid_Grid.prototype._dateTimeUtil = null;
 /** @type {boolean}
 * @private
 */
-Grid.prototype._initializing = false;
+Grid_Grid.prototype._initializing = false;
 /** @type {number}
 * @private
 */
-Grid.prototype._pollingInterval = 0;
+Grid_Grid.prototype._pollingInterval = 0;
 /** @type {number}
 * @private
 */
-Grid.prototype._pollingTimerId = 0;
+Grid_Grid.prototype._pollingTimerId = 0;
 /** @type {number}
 * @private
 */
-Grid.prototype._lastPollingRequest = 0;
+Grid_Grid.prototype._lastPollingRequest = 0;
 /** @type {boolean}
 * @private
 */
-Grid.prototype._pollingEnabled = true;
+Grid_Grid.prototype._pollingEnabled = true;
 /** @type {boolean}
 * @private
 */
-Grid.prototype._fieldCaching = false;
+Grid_Grid.prototype._fieldCaching = false;
 /** @type {boolean}
 * @private
 */
-Grid.prototype._timeSeriesExpansion = true;
+Grid_Grid.prototype._timeSeriesExpansion = true;
 
 /** @type {string}
 * @private
 */
-Grid.prototype._childDataField = "";
+Grid_Grid.prototype._childDataField = "";
 /** @type {boolean}
 * @private
 */
-Grid.prototype._topSection = true;
+Grid_Grid.prototype._topSection = true;
 /** @type {Object}
 * @private
 */
-Grid.prototype._focusingArgs = null;
+Grid_Grid.prototype._focusingArgs = null;
+/** @type {boolean}
+* @private
+*/
+Grid_Grid.prototype._hasNewUpdates = false;
 
 /** @public
 */
-Grid.prototype.dispose = function() {
+Grid_Grid.prototype.dispose = function() {
 	this.removeAllEventListeners();
 	if(this._autoLayoutTimer) {
 		clearInterval(this._autoLayoutTimer);
@@ -45496,24 +45519,24 @@ Grid.prototype.dispose = function() {
 /** @public
 * @return {Element}
 */
-Grid.prototype.getElement = function() {
+Grid_Grid.prototype.getElement = function() {
 	return this._topNode;
 };
 /** Alias to {@link EventDispatcher#removeAllEventListeners}
 * @public
 * @function
 */
-Grid.prototype.removeEventListeners = Grid.prototype.removeAllEventListeners;
+Grid_Grid.prototype.removeEventListeners = Grid_Grid.prototype.removeAllEventListeners;
 /** Alias to {@link EventDispatcher#addEventListener}
 * @public
 * @function
 * @param {string} type Event name
 * @param {Function} handler Event handler
 */
-Grid.prototype.listen = Grid.prototype.addEventListener;
+Grid_Grid.prototype.listen = Grid_Grid.prototype.addEventListener;
 /** @public
 */
-Grid.prototype.initSubscription = function() {
+Grid_Grid.prototype.initSubscription = function() {
 	if(this._subs) { // Subscription is already initialized
 		return;
 	}
@@ -45561,7 +45584,7 @@ Grid.prototype.initSubscription = function() {
 
 /** @public
 */
-Grid.prototype.updateLayout = function() {
+Grid_Grid.prototype.updateLayout = function() {
 	this._grid.updateLayout();
 	this._stp.updateSortSymbols(); // HACK: There is a chance that grid may not yet be in the document
 };
@@ -45569,7 +45592,7 @@ Grid.prototype.updateLayout = function() {
 * @private
 * @param {number=} rowIndex
 */
-Grid.prototype._updateRowData = function(rowIndex) {
+Grid_Grid.prototype._updateRowData = function(rowIndex) {
 	if(rowIndex >= 0) {
 		let rowId = this._dv.getRowId(rowIndex);
 		if(rowId) {
@@ -45583,11 +45606,11 @@ Grid.prototype._updateRowData = function(rowIndex) {
 * @function
 * @param {number=} opt_rowIndex
 */
-Grid.prototype.updateRowData = Grid.prototype._updateRowData;
+Grid_Grid.prototype.updateRowData = Grid_Grid.prototype._updateRowData;
 
 /** @private
  */
-Grid.prototype._addGridSections = function () {
+Grid_Grid.prototype._addGridSections = function () {
 	let title = this._grid.addSection("title");
 	if(this._topSection == false){
 		title.setRowCount(0);
@@ -45607,7 +45630,7 @@ Grid.prototype._addGridSections = function () {
 * @param {string=} sectionName
 * @return {*} Return Section instance
  */
-Grid.prototype.addHeaderSection = function (sectionName) {
+Grid_Grid.prototype.addHeaderSection = function (sectionName) {
 	let titleSects = this._grid.getAllSections("title");
 
 	let headerSect = this._grid.addSectionAt(titleSects.length, "title", sectionName);
@@ -45624,7 +45647,7 @@ Grid.prototype.addHeaderSection = function (sectionName) {
 * @param {string=} sectionName
 * @return {*} Return Section instance
 */
-Grid.prototype.addFooterSection = function (sectionName) {
+Grid_Grid.prototype.addFooterSection = function (sectionName) {
 	let footerSect = this._grid.addSection("footer", sectionName);
 	if(footerSect) {
 		footerSect.setRowCount(1);
@@ -45639,14 +45662,14 @@ Grid.prototype.addFooterSection = function (sectionName) {
 /** @public
 * @param {Element} elem Parent element
 */
-Grid.prototype.setParent = function (elem) {
+Grid_Grid.prototype.setParent = function (elem) {
 	Dom.appendChild(elem, this._topNode);
 	this.updateLayout();
 };
 /** @public
 * @param {Element} elem Sibling element
 */
-Grid.prototype.insertBefore = function (elem) {
+Grid_Grid.prototype.insertBefore = function (elem) {
 	if(elem) {
 		let pn = elem.parentNode;
 		if(pn) {
@@ -45667,21 +45690,21 @@ Grid.prototype.insertBefore = function (elem) {
 * @param {!ElementWrapper|Element|Event|MouseEvent} obj Element, Browser's Event object, Browser's Mouse Event object are all valid
 * @return {!Object}
 */
-Grid.prototype.getRelativePosition = function (obj) {
+Grid_Grid.prototype.getRelativePosition = function (obj) {
 	return this._grid.getRelativePosition(obj);
 };
 /** The returned core grid
 * @public
 * @return {Core}
 */
-Grid.prototype.getCoreGrid = function () {
+Grid_Grid.prototype.getCoreGrid = function () {
 	return this._grid;
 };
 
 /** @public
 * @param {Grid~GridOptions=} gridOption
 */
-Grid.prototype.initialize = function(gridOption) {
+Grid_Grid.prototype.initialize = function(gridOption) {
 	if (!gridOption) {
 		this.initSubscription();
 		return;
@@ -45985,7 +46008,7 @@ Grid.prototype.initialize = function(gridOption) {
 * @param {Object=} gridOptions
 * @return {!Object}
 */
-Grid.prototype.getConfigObject = function (gridOptions) {
+Grid_Grid.prototype.getConfigObject = function (gridOptions) {
 	let obj = gridOptions || {};
 
 	let columns = obj.columns;
@@ -46144,7 +46167,7 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 * @ignore
 * @param {Object} dateTimeUtil
 */
-Grid.prototype.setDateTimeUtil = function(dateTimeUtil) {
+Grid_Grid.prototype.setDateTimeUtil = function(dateTimeUtil) {
 	if(this._dateTimeUtil !== dateTimeUtil) {
 		this._dateTimeUtil = dateTimeUtil;
 		this._dateTimeUtil.setLocale(this._lang);
@@ -46153,7 +46176,7 @@ Grid.prototype.setDateTimeUtil = function(dateTimeUtil) {
 /** @public
 * @param {string} lang
 */
-Grid.prototype.setLocale = function(lang) {
+Grid_Grid.prototype.setLocale = function(lang) {
 	if(lang && this._lang !== lang) {
 		this._lang = lang;
 		this._dateTimeUtil.setLocale(lang);
@@ -46165,7 +46188,7 @@ Grid.prototype.setLocale = function(lang) {
 * @param {Object} defaultCol
 * @param {Array.<Object>} userColumns
 */
-Grid.prototype._defaultColumnSetup = function (defaultCol, userColumns) {
+Grid_Grid.prototype._defaultColumnSetup = function (defaultCol, userColumns) {
 	let c = userColumns.length;
 	for (let i = 0; i < c; i++) {
 		let column = userColumns[i];
@@ -46186,7 +46209,7 @@ Grid.prototype._defaultColumnSetup = function (defaultCol, userColumns) {
 * @param {string} field A function name of plugin instance
 * @param {Array.<*>} params Inputs that will pass to a function call
 */
-Grid.prototype._processExtension = function (exts, field, params) {
+Grid_Grid.prototype._processExtension = function (exts, field, params) {
 	if(Array.isArray(exts)) {
 		for (let i = 0; i < exts.length; i++) {
 			if (exts[i][field]) {
@@ -46199,7 +46222,7 @@ Grid.prototype._processExtension = function (exts, field, params) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onRicAdded = function(e) {
+Grid_Grid.prototype._onRicAdded = function(e) {
 	let addedRics = e.addedRics;
 	this._snapshot.addFields(e.fields);
 	let len = addedRics.length;
@@ -46221,14 +46244,14 @@ Grid.prototype._onRicAdded = function(e) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onRicRemoved = function(e) {
+Grid_Grid.prototype._onRicRemoved = function(e) {
 	this._dispatch(e.type, e);
 };
 
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onFieldAdded = function(e) {
+Grid_Grid.prototype._onFieldAdded = function(e) {
 	let rowDefs = e.rowDefs;
 	let addedFields = e.addedFields;
 
@@ -46251,7 +46274,7 @@ Grid.prototype._onFieldAdded = function(e) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onFieldRemoved = function(e) {
+Grid_Grid.prototype._onFieldRemoved = function(e) {
 	let removedFields = e.removedFields;
 
 	// TODO: ADC fields have an interval load. Currently, we only keep the field but do not delete it.
@@ -46267,7 +46290,7 @@ Grid.prototype._onFieldRemoved = function(e) {
 * @param {ColumnDefinition~Options|string} columnOption String will be treated as field, while object is treated as the column options
 * @param {number=} idx
 */
-Grid.prototype.insertColumn = function (columnOption, idx) {
+Grid_Grid.prototype.insertColumn = function (columnOption, idx) {
 	let colCount = this.getColumnCount();
 	if(idx == null || idx > colCount) {
 		idx = colCount;
@@ -46301,7 +46324,7 @@ Grid.prototype.insertColumn = function (columnOption, idx) {
 * @private
 * @param {Object} e snapshort change event object
 */
-Grid.prototype._updateTimeSeriesFields = function (e) {
+Grid_Grid.prototype._updateTimeSeriesFields = function (e) {
 	let childField;
 	let snapShotData = e.data;
 	let childFields = {};
@@ -46348,7 +46371,7 @@ Grid.prototype._updateTimeSeriesFields = function (e) {
 /** @private
 * @param {ColumnDefinition} colDef
 */
-Grid.prototype._populateTimeSeriesChildren = function (colDef) {
+Grid_Grid.prototype._populateTimeSeriesChildren = function (colDef) {
 	if(this._timeSeriesChildConflator.conflate(colDef) ) {
 		return;
 	}
@@ -46388,7 +46411,7 @@ Grid.prototype._populateTimeSeriesChildren = function (colDef) {
 * @param {string} childField field
 * @param {number} idx index of insertion column
 */
-Grid.prototype._cloneTimeSeriesColumn = function (parentColDef, childField, idx) {
+Grid_Grid.prototype._cloneTimeSeriesColumn = function (parentColDef, childField, idx) {
 	let parentConfig, columnOption;
 	parentConfig = parentColDef.getConfigObject();
 	columnOption = cloneObject(parentConfig);
@@ -46405,7 +46428,7 @@ Grid.prototype._cloneTimeSeriesColumn = function (parentColDef, childField, idx)
 * @param {ColumnDefinition~Options|string} columnOption String will be treated as field, while object is treated as the column options
 * @param {Grid~ColumnReference} colRef
 */
-Grid.prototype.replaceColumn = function (columnOption, colRef) {
+Grid_Grid.prototype.replaceColumn = function (columnOption, colRef) {
 	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) {
 		return;
@@ -46477,7 +46500,7 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
  * @param {ColumnDefinition} colDef
  * @param {Object} response
  */
-Grid.prototype._onFieldLoadedSuccess = function (field, colDef, response) {
+Grid_Grid.prototype._onFieldLoadedSuccess = function (field, colDef, response) {
 	if(this._connector && response && response.id) {
 		let fieldDef = response;
 		if (colDef && colDef.getField() === field) {
@@ -46493,7 +46516,7 @@ Grid.prototype._onFieldLoadedSuccess = function (field, colDef, response) {
  * @private
  * @param {Object} err
  */
-Grid.prototype._onFieldLoadedError = function (err) {
+Grid_Grid.prototype._onFieldLoadedError = function (err) {
 	// TODO: May implement retry mechanism here, if need
 };
 
@@ -46502,7 +46525,7 @@ Grid.prototype._onFieldLoadedError = function (err) {
  * @param {string} field
  * @param {string} referrer
  */
-Grid.prototype._onFieldLoaded = function (field, referrer) {
+Grid_Grid.prototype._onFieldLoaded = function (field, referrer) {
 	if(this._connector) {
 		// 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)) {
@@ -46517,7 +46540,7 @@ Grid.prototype._onFieldLoaded = function (field, referrer) {
  * @private
  * @param {Element} host
  */
-Grid.prototype._setScrollbarParent = function (host) {
+Grid_Grid.prototype._setScrollbarParent = function (host) {
 	host.style.boxSizing = "border-box";
 	host.style.overflow = "hidden";
 	host.style.position = "relative";
@@ -46535,7 +46558,7 @@ Grid.prototype._setScrollbarParent = function (host) {
 * @param {string} field
 * @return {Object}
 */
-Grid.prototype.getFieldInfo = function(field) {
+Grid_Grid.prototype.getFieldInfo = function(field) {
 	return js_FieldDefinition.getFieldInfo(field);
 };
 /** Request field information from Synapse service. If field information already exists, a resolved promise is returned. Synapse config must be supplied before the request can be made.
@@ -46553,7 +46576,7 @@ Grid.prototype.getFieldInfo = function(field) {
 * };
 * let promise = grid.loadFieldInfo("CF_LAST");
 */
-Grid.prototype.loadFieldInfo = function(field) {
+Grid_Grid.prototype.loadFieldInfo = function(field) {
 	return js_FieldDefinition.loadFieldInfo(field);
 };
 
@@ -46562,7 +46585,7 @@ Grid.prototype.loadFieldInfo = function(field) {
 * @param {string} field
 * @returns {boolean}
 */
-Grid.prototype._shouldLoadFieldInfo = function (field) {
+Grid_Grid.prototype._shouldLoadFieldInfo = function (field) {
 
 	let val = this._RTK || window["JET"]; // Fastest checking can be performed by checking the first condition.
 	if(!val) {
@@ -46590,7 +46613,7 @@ Grid.prototype._shouldLoadFieldInfo = function (field) {
 * @public
 * @param {Array.<Object>} columns Array of column options
 */
-Grid.prototype.setColumns = function(columns) {
+Grid_Grid.prototype.setColumns = function(columns) {
 	let grid = this._grid;
 	let colCount = (columns) ? columns.length : 0;
 
@@ -46617,7 +46640,7 @@ Grid.prototype.setColumns = function(columns) {
 * @param {Array.<Object>} columns Array of column options
 * @param {boolean=} byId=false, if enable it, this method will only check for differences in the 'id' property
 */
-Grid.prototype.restoreColumns = function(columns, byId) {
+Grid_Grid.prototype.restoreColumns = function(columns, byId) {
 	let grid = this._grid;
 	grid.startBatch("reset");
 	let configObj = this.getConfigObject();
@@ -46684,12 +46707,12 @@ Grid.prototype.restoreColumns = function(columns, byId) {
 * @param {Array.<string>} ary Array of fields (string)
 * @see {@link Grid#setColumns}
 */
-Grid.prototype.setFields = Grid.prototype.setColumns;
+Grid_Grid.prototype.setFields = Grid_Grid.prototype.setColumns;
 
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onColumnAdded = function(e) {
+Grid_Grid.prototype._onColumnAdded = function(e) {
 	let colDef = /** @type{ColumnDefinition} */(e.context[COL_DEF]);
 	delete e.context[COL_DEF];
 	let idx = e.colIndex;
@@ -46792,7 +46815,7 @@ Grid.prototype._onColumnAdded = function(e) {
 * @see {@link Grid#removeColumns}
 * @see {@link Grid#removeAllColumns}
 */
-Grid.prototype.removeColumn = function(colRef) {
+Grid_Grid.prototype.removeColumn = function(colRef) {
 	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) {
 		return;
@@ -46812,7 +46835,7 @@ Grid.prototype.removeColumn = function(colRef) {
 * @see {@link Grid#removeColumn}
 * @see {@link Grid#removeAllColumns}
 */
-Grid.prototype.removeColumns = function(colRefs) {
+Grid_Grid.prototype.removeColumns = function(colRefs) {
 	let indices = this.getColumnIndices(colRefs);
 	let len = indices.length;
 	if(len <= 1) {
@@ -46821,7 +46844,7 @@ Grid.prototype.removeColumns = function(colRefs) {
 		}
 		return;
 	}
-	indices.sort(Grid._descendingOrder); // Removal must be done from the back
+	indices.sort(Grid_Grid._descendingOrder); // Removal must be done from the back
 
 	let prevState = this._grid.freezeLayout(); // To prevent multiple UI updates
 
@@ -46840,7 +46863,7 @@ Grid.prototype.removeColumns = function(colRefs) {
 * @see {@link Grid#removeColumn}
 * @see {@link Grid#removeColumns}
 */
-Grid.prototype.removeAllColumns = function() {
+Grid_Grid.prototype.removeAllColumns = function() {
 	let colCount = this.getColumnCount();
 	if(colCount <= 0) {
 		return;
@@ -46871,7 +46894,7 @@ Grid.prototype.removeAllColumns = function() {
 * @return {boolean} Return true if there is any change, and false otherwise
 * @see {@link Grid#moveColumnById}
 */
-Grid.prototype.moveColumn = function (fromColIndex, toColIndex) {
+Grid_Grid.prototype.moveColumn = function (fromColIndex, toColIndex) {
 	return this._grid.moveColumn(fromColIndex, toColIndex);
 };
 /** If source column is not found, no operation is performed. If destination column is not found, the source column will be moved to the last position.<br>
@@ -46888,7 +46911,7 @@ Grid.prototype.moveColumn = function (fromColIndex, toColIndex) {
 * grid.moveColumnById("sourceColumnId", "anotherId");
 * grid.moveColumnById("sourceColumnId", ""); // move to the last position
 */
-Grid.prototype.moveColumnById = function (srcCol, destCol) {
+Grid_Grid.prototype.moveColumnById = function (srcCol, destCol) {
 	return this._grid.moveColumnById(srcCol, destCol);
 };
 
@@ -46897,7 +46920,7 @@ Grid.prototype.moveColumnById = function (srcCol, destCol) {
 * @param {(number|string)=} destCol Destination position where the moved columns will be placed BEFORE the specified position. This can be column id or index
 * @return {boolean} Return true if there is any change, and false otherwise
 */
-Grid.prototype.reorderColumns = function (colRefs, destCol) {
+Grid_Grid.prototype.reorderColumns = function (colRefs, destCol) {
 	return this._grid.reorderColumns(colRefs, destCol);
 };
 
@@ -46908,7 +46931,7 @@ Grid.prototype.reorderColumns = function (colRefs, destCol) {
 * @see {@link Grid#hideColumns}
 * @see {@link Grid#showAllColumns}
 */
-Grid.prototype.hideColumn = function(colRef, hidden) {
+Grid_Grid.prototype.hideColumn = function(colRef, hidden) {
 	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) { // not found
 		return;
@@ -46923,14 +46946,14 @@ Grid.prototype.hideColumn = function(colRef, hidden) {
 * @see {@link Grid#hideColumn}
 * @see {@link Grid#showAllColumns}
 */
-Grid.prototype.hideColumns = function(colRefs, hidden) {
+Grid_Grid.prototype.hideColumns = function(colRefs, hidden) {
 	this._grid.hideColumns(this.getColumnIndices(colRefs), hidden);
 };
 /** @public
 * @see {@link Grid#hideColumn}
 * @see {@link Grid#hideColumns}
 */
-Grid.prototype.showAllColumns = function() {
+Grid_Grid.prototype.showAllColumns = function() {
 	this._grid.showAllColumns();
 };
 /** @private
@@ -46939,7 +46962,7 @@ Grid.prototype.showAllColumns = function() {
 * @param {number} b
 * @return {number}
 */
-Grid._descendingOrder = function(a, b) {
+Grid_Grid._descendingOrder = function(a, b) {
 	return b - a;
 };
 
@@ -46949,7 +46972,7 @@ Grid._descendingOrder = function(a, b) {
 * @param {string=} referrer
 * @return {boolean}
 */
-Grid.prototype.addDataFields = function(fieldRef, referrer) {
+Grid_Grid.prototype.addDataFields = function(fieldRef, referrer) {
 	if(!fieldRef) {
 		return false;
 	}
@@ -46984,7 +47007,7 @@ Grid.prototype.addDataFields = function(fieldRef, referrer) {
 * @param {string=} referrer
 * @return {boolean}
 */
-Grid.prototype.removeDataFields = function(fieldRef, referrer) {
+Grid_Grid.prototype.removeDataFields = function(fieldRef, referrer) {
 	if(!fieldRef) {
 		return false;
 	}
@@ -46995,7 +47018,7 @@ Grid.prototype.removeDataFields = function(fieldRef, referrer) {
 /** @public
 * @param {string} referrer
 */
-Grid.prototype.removeFieldReferrer = function(referrer) {
+Grid_Grid.prototype.removeFieldReferrer = function(referrer) {
 	if(!referrer) {
 		return;
 	}
@@ -47007,7 +47030,7 @@ Grid.prototype.removeFieldReferrer = function(referrer) {
 * @param {Grid~ColumnReference} colRef
 * @param {string=} opt_order This can be "ascending", "descending", "none", "noOrder", or "originalOrder"
 */
-Grid.prototype.sortColumn = function(colRef, opt_order) {
+Grid_Grid.prototype.sortColumn = function(colRef, opt_order) {
 	if(typeof colRef === "string") {
 		this._stp.sortColumn(colRef, opt_order); // Allow sorting by field
 		return;
@@ -47024,7 +47047,7 @@ Grid.prototype.sortColumn = function(colRef, opt_order) {
 * @param {number} colIndex
 * @param {string} str
 */
-Grid.prototype.setColumnName = function(colIndex, str) {
+Grid_Grid.prototype.setColumnName = function(colIndex, str) {
 	let colDef = this.getColumnDefinition(colIndex);
 	if(colDef) {
 		colDef.setName(str);
@@ -47035,7 +47058,7 @@ Grid.prototype.setColumnName = function(colIndex, str) {
 * @param {Grid~ColumnReference} colRef
 * @return {string}
 */
-Grid.prototype.getColumnBackgroundColor = function(colRef) {
+Grid_Grid.prototype.getColumnBackgroundColor = function(colRef) {
 	let colDef = this.getColumnDefinition(colRef);
 	if(colDef) {
 		return colDef.getBackgroundColor();
@@ -47046,7 +47069,7 @@ Grid.prototype.getColumnBackgroundColor = function(colRef) {
 * @param {Grid~ColumnReference} colRef
 * @param {string} color
 */
-Grid.prototype.setColumnBackgroundColor = function(colRef, color) {
+Grid_Grid.prototype.setColumnBackgroundColor = function(colRef, color) {
 	let colDef = this.getColumnDefinition(colRef);
 	if(colDef) {
 		colDef.setBackgroundColor(color);
@@ -47056,7 +47079,7 @@ Grid.prototype.setColumnBackgroundColor = function(colRef, color) {
 * @param {Grid~ColumnReference} colRef
 * @param {Function=} func
 */
-Grid.prototype.setColumnRenderer = function(colRef, func) {
+Grid_Grid.prototype.setColumnRenderer = function(colRef, func) {
 	let colIndex = this.getColumnIndex(colRef);
 	this.setColumnFormatter(colIndex, func);
 };
@@ -47066,7 +47089,7 @@ Grid.prototype.setColumnRenderer = function(colRef, func) {
 * @param {string=} id ID for renderer mapping. If not specified the default renderer will be picked up
 * @param {Function=} func If not specified the renderer which corresponded id from mapping will be picked up
 */
-Grid.prototype.activateColumnRenderer = function(colRef, id, func) {
+Grid_Grid.prototype.activateColumnRenderer = function(colRef, id, func) {
 	let colIndex = this.getColumnIndex(colRef);
 	if (colIndex == null) { return; }
 
@@ -47084,7 +47107,7 @@ Grid.prototype.activateColumnRenderer = function(colRef, id, func) {
  * @param {number} colIndex Column index of the position of the column to be updated
  * @param {Object|Function=} formatter Formatter object or bind function
  */
-Grid.prototype.setColumnFormatter = function (colIndex, formatter) {
+Grid_Grid.prototype.setColumnFormatter = function (colIndex, formatter) {
 	if (colIndex == null) { return; }
 
 	let colDef = this.getColumnDefinition(colIndex);
@@ -47128,7 +47151,7 @@ Grid.prototype.setColumnFormatter = function (colIndex, formatter) {
 * @param {Grid~ColumnReference} colRef
 * @param {ColumnDefinition~SortLogic=} func
 */
-Grid.prototype.setColumnSorter = function(colRef, func) {
+Grid_Grid.prototype.setColumnSorter = function(colRef, func) {
 	let colIndex = this.getColumnIndex(colRef);
 	let colDef = this.getColumnDefinition(colIndex);
 	if(colDef) {
@@ -47146,7 +47169,7 @@ Grid.prototype.setColumnSorter = function(colRef, func) {
 * @private
 * @param {!RowDefinition} rowDef
 */
-Grid.prototype._initDuplicateRicData = function(rowDef) {
+Grid_Grid.prototype._initDuplicateRicData = function(rowDef) {
 	if(!rowDef) {
 		return;
 	}
@@ -47166,7 +47189,7 @@ Grid.prototype._initDuplicateRicData = function(rowDef) {
 /** @private
 * @param {Object} newRowDef
 */
-Grid.prototype._cloneChain = function(newRowDef) {
+Grid_Grid.prototype._cloneChain = function(newRowDef) {
 	let rowDefs = this._connector.getRowDefByRic(newRowDef.getSymbol());
 	let firstRowDef = rowDefs ? rowDefs[0] : null;
 	let constituents = firstRowDef ? firstRowDef.getChildren() : null;
@@ -47199,7 +47222,7 @@ Grid.prototype._cloneChain = function(newRowDef) {
 * 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) {
+Grid_Grid.prototype.insertRow = function(rowOption, rowRef) {
 	if(this._mainGrid) {
 		return this._mainGrid.insertRow(rowOption, this._getRowId(rowRef));
 	}
@@ -47214,8 +47237,12 @@ Grid.prototype.insertRow = function(rowOption, rowRef) {
 		}
 	}
 	let rowDef = new RowDefinition(rowOption);
+
+	if(rowDef.setDataSource(this._dc, this._subs)) { // This could also subscribe chain index/ric to JET/RTK
+		this._hasNewUpdates = true; // Mark data table for cleaning it up later
+	}
 	rowDef.registerToView(this._dv, this._getRowId(rowRef));
-	rowDef.setDataSource(this._dc, this._subs); // This could also subscribe chain index/ric to JET/RTK
+
 	this._initDuplicateRicData(rowDef);
 
 	if(rowOption && rowOption["hidden"]) {
@@ -47230,7 +47257,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
 * @returns {RowDefinition}
 */
-Grid.prototype.insertSegmentSeparator = function(rowOption, rowRef) {
+Grid_Grid.prototype.insertSegmentSeparator = function(rowOption, rowRef) {
 	if(!rowOption) {
 		rowOption = {};
 	}
@@ -47253,7 +47280,7 @@ Grid.prototype.insertSegmentSeparator = function(rowOption, rowRef) {
 *  null
 * ]); // 4 rows are appended
 */
-Grid.prototype.insertRows = function(rowOptions, rowRef, opt_fields) {
+Grid_Grid.prototype.insertRows = function(rowOptions, rowRef, opt_fields) {
 	if(this._mainGrid) {
 		this._mainGrid.insertRows(rowOptions, this._getRowId(rowRef));
 		return;
@@ -47299,7 +47326,7 @@ Grid.prototype.insertRows = function(rowOptions, rowRef, opt_fields) {
 * ]); // 3 more rows are appended
 * grid.logDV({"colNames": ["field1", "field2", "field3", "field4"]}); // See results in console
 */
-Grid.prototype.addStaticDataRows = function(dataRows, fields) {
+Grid_Grid.prototype.addStaticDataRows = function(dataRows, fields) {
 	if(this._mainGrid) {
 		this._mainGrid.addStaticDataRows(dataRows, fields);
 		return;
@@ -47318,7 +47345,7 @@ Grid.prototype.addStaticDataRows = function(dataRows, fields) {
 		}
 	}
 	if(dataRows) {
-		this.insertRows(dataRows.map(Grid._dataToRowOptions), null, fields);
+		this.insertRows(dataRows.map(Grid_Grid._dataToRowOptions), null, fields);
 	}
 };
 /** Insert, update, remove and reorder data based on the given array of records
@@ -47363,7 +47390,7 @@ Grid.prototype.addStaticDataRows = function(dataRows, fields) {
 * 	{ id: "E", field2: 1, field3: 2, field4: "Something E" },
 * ], "id");
 */
-Grid.prototype.updateDataSet = function(records, rowIdentifier) {
+Grid_Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 	if(!Array.isArray(records) || records.length === 0 ) {
 		this.removeAllRows();
 		return;
@@ -47448,7 +47475,7 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 * @param {Array|Object} item
 * @return {!Object}
 */
-Grid._dataToRowOptions = function(item) {
+Grid_Grid._dataToRowOptions = function(item) {
 	return {values: item};
 };
 /** @public
@@ -47457,7 +47484,7 @@ Grid._dataToRowOptions = function(item) {
 * @see {@link Grid#removeRows}
 * @see {@link Grid#removeAllRows}
 */
-Grid.prototype.removeRow = function(rowRef) {
+Grid_Grid.prototype.removeRow = function(rowRef) {
 	if(this._mainGrid) {
 		return this._mainGrid.removeRow(this._getRowId(rowRef));
 	}
@@ -47476,7 +47503,7 @@ Grid.prototype.removeRow = function(rowRef) {
 * @see {@link Grid#removeRow}
 * @see {@link Grid#removeAllRows}
 */
-Grid.prototype.removeRows = function(rowRefs) {
+Grid_Grid.prototype.removeRows = function(rowRefs) {
 	let rowDef;
 	if(!Array.isArray(rowRefs)) {
 		rowDef = this.removeRow(rowRefs);
@@ -47519,7 +47546,7 @@ Grid.prototype.removeRows = function(rowRefs) {
 * @see {@link Grid#removeRow}
 * @see {@link Grid#removeRows}
 */
-Grid.prototype.removeAllRows = function() {
+Grid_Grid.prototype.removeAllRows = function() {
 	if(this._sharedDataSource) {
 		return;
 	}
@@ -47549,7 +47576,7 @@ Grid.prototype.removeAllRows = function() {
 * @private
 * @param {!RowDefinition} rowDef
 */
-Grid.prototype._removeRow = function(rowDef) {
+Grid_Grid.prototype._removeRow = function(rowDef) {
 	if(this._sharedDataSource) {
 		return;
 	}
@@ -47567,7 +47594,7 @@ Grid.prototype._removeRow = function(rowDef) {
 /** @private
 * @param {Array.<RowDefinition>} rowDefs
 */
-Grid.prototype._removeConstituentRows = function(rowDefs) {
+Grid_Grid.prototype._removeConstituentRows = function(rowDefs) {
 	let connector = this._connector;
 	let rowIds = [];
 	for(let i = 0; i < rowDefs.length; i++) {
@@ -47584,7 +47611,7 @@ Grid.prototype._removeConstituentRows = function(rowDefs) {
 * @param {Grid~RowReference} rowRef
 * @param {boolean=} hidden if false, show instead of hide
 */
-Grid.prototype.hideRow = function(rowRef, hidden) {
+Grid_Grid.prototype.hideRow = function(rowRef, hidden) {
 	let rid = this._getRowId(rowRef);
 	let grid = this._mainGrid || this._grid;
 	grid.hideRow(rid, hidden);
@@ -47595,7 +47622,7 @@ Grid.prototype.hideRow = function(rowRef, hidden) {
 * @param {boolean=} hidden if false, show instead of hide
 * @public
 */
-Grid.prototype.hideRows = function (rowRefs, hidden) {
+Grid_Grid.prototype.hideRows = function (rowRefs, hidden) {
 	if (!Array.isArray(rowRefs)) {
 		rowRefs = [rowRefs];
 	}
@@ -47609,21 +47636,21 @@ Grid.prototype.hideRows = function (rowRefs, hidden) {
 * @param {boolean=} shown if false, hide instead of show
 * @public
 */
-Grid.prototype.showRows = function (rowRefs, shown) {
+Grid_Grid.prototype.showRows = function (rowRefs, shown) {
 	this.hideRows(rowRefs, shown === false);
 };
 /**
  * Unhide all hidden rows in the Grid
  * @public
  */
-Grid.prototype.unhideAllRows = function () {
+Grid_Grid.prototype.unhideAllRows = function () {
 	this._grid.unhideAllRows();
 };
 /**
 * @public
 * @returns {boolean}
 */
-Grid.prototype.hasHiddenRow = function(){
+Grid_Grid.prototype.hasHiddenRow = function(){
 	return this._grid.hasHiddenRow();
 };
 
@@ -47634,7 +47661,7 @@ Grid.prototype.hasHiddenRow = function(){
 * @param {RowDefinition~Options=} options
 * @returns {RowDefinition} Returns modified Row Definition instance
 */
-Grid.prototype.setRic = function(rowRef, str, options) {
+Grid_Grid.prototype.setRic = function(rowRef, str, options) {
 	if(this._mainGrid) {
 		return this._mainGrid.setRic(this._toRowId(rowRef), str, options);
 	}
@@ -47673,7 +47700,7 @@ Grid.prototype.setRic = function(rowRef, str, options) {
  * @public
  * @param {Grid~RowReference} rowRef
  */
-Grid.prototype.unlinkChain = function(rowRef) {
+Grid_Grid.prototype.unlinkChain = function(rowRef) {
 	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(!rowDef) {
 		return;
@@ -47734,21 +47761,21 @@ Grid.prototype.unlinkChain = function(rowRef) {
 * @param {string} str
 * @see {@link Grid.setRic}
 */
-Grid.prototype.setRowContent = Grid.prototype.setRic;
+Grid_Grid.prototype.setRowContent = Grid_Grid.prototype.setRic;
 
 /**
 * @public
 * @param {string|number} rid Row Id or index
 * @param {boolean=} force
 */
-Grid.prototype.toggleRowExpansion = function(rid, force) {
+Grid_Grid.prototype.toggleRowExpansion = function(rid, force) {
 	this._dv.toggleRowExpansion(rid, force);
 };
 /**
 * @private
 * @param {object} e
 */
-Grid.prototype._onRowExpansionBinding = function(e) {
+Grid_Grid.prototype._onRowExpansionBinding = function(e) {
 	if(!this.hasListener("rowExpansionBinding")) {
 		return;
 	}
@@ -47769,7 +47796,7 @@ Grid.prototype._onRowExpansionBinding = function(e) {
 * @public
 * @param {Array.<string>} ary
 */
-Grid.prototype.setRics = function(ary) {
+Grid_Grid.prototype.setRics = function(ary) {
 	this.removeAllRows();
 	if(ary && ary.length) {
 		this.insertRows(ary);
@@ -47780,34 +47807,34 @@ Grid.prototype.setRics = function(ary) {
 * @public
 * @return {number}
 */
-Grid.prototype.getRowCount = function() {
+Grid_Grid.prototype.getRowCount = function() {
 	return this._dv.getRowCount();
 };
 /** Get all rows without paging
 * @public
 * @return {number}
 */
-Grid.prototype.getPageItemCount = function() {
+Grid_Grid.prototype.getPageItemCount = function() {
 	return this._dv.getRowCount(false, true);
 };
 /** WARNING: This represents number of rows in the DataTable which includes all invisible rows and rows in multiple wrapped grids
 * @public
 * @return {number}
 */
-Grid.prototype.getDataRowCount = function() {
+Grid_Grid.prototype.getDataRowCount = function() {
 	return this._dt.getRowCount();
 };
 /** @public
 * @return {number}
 */
-Grid.prototype.getColumnCount = function() {
+Grid_Grid.prototype.getColumnCount = function() {
 	return this._grid.getColumnCount();
 };
 /** @public
 * @param {number} colIndex
 * @return {string}
 */
-Grid.prototype.getColumnDataType = function(colIndex) {
+Grid_Grid.prototype.getColumnDataType = function(colIndex) {
 	let colDef = this.getColumnDefinition(colIndex);
 	if (colDef) {
 		return colDef.getDataType();
@@ -47818,7 +47845,7 @@ Grid.prototype.getColumnDataType = function(colIndex) {
 * @param {number} colIndex
 * @return {ColumnDefinition}
 */
-Grid.prototype.getColumnDefinition = function(colIndex) {
+Grid_Grid.prototype.getColumnDefinition = function(colIndex) {
 	let colData = this._grid.getColumnData(colIndex);
 	if(colData) {
 		return /** @type{ColumnDefinition} */(colData[COL_DEF]) || null;
@@ -47828,7 +47855,7 @@ Grid.prototype.getColumnDefinition = function(colIndex) {
 /** @public
 * @return {!Array.<ColumnDefinition>}
 */
-Grid.prototype.getColumnDefinitions = function() {
+Grid_Grid.prototype.getColumnDefinitions = function() {
 	let colCount = this.getColumnCount();
 	let colDefs = new Array(colCount);
 	for(let i = 0; i < colCount; i++) {
@@ -47841,7 +47868,7 @@ Grid.prototype.getColumnDefinitions = function() {
 * @param {string} colId
 * @return {ColumnDefinition}
 */
-Grid.prototype.getColumnDefinitionById = function(colId) {
+Grid_Grid.prototype.getColumnDefinitionById = function(colId) {
 	if(typeof colId === "string") {
 		return this.getColumnDefinition(this.getColumnIndex(colId));
 	}
@@ -47852,7 +47879,7 @@ Grid.prototype.getColumnDefinitionById = function(colId) {
 * @param {Array.<string>} colIds
 * @return {ColumnDefinition}
 */
-Grid.prototype.getColumnDefinitionsById = function(colIds) {
+Grid_Grid.prototype.getColumnDefinitionsById = function(colIds) {
 	let colCount = Array.isArray(colIds) ? colIds.length : 0;
 	if(colCount > 0) {
 		let i, colId;
@@ -47870,7 +47897,7 @@ Grid.prototype.getColumnDefinitionsById = function(colIds) {
 * @param {Grid~ColumnReference} colRef
 * @return {ColumnDefinition}
 */
-Grid.prototype._getColumnDefinition = function(colRef) {
+Grid_Grid.prototype._getColumnDefinition = function(colRef) {
 	if(colRef instanceof ColumnDefinition) {
 		return /** @type{!ColumnDefinition} */(colRef);
 	} else if(typeof colRef === "number") {
@@ -47890,7 +47917,7 @@ Grid.prototype._getColumnDefinition = function(colRef) {
 * @param {number|string} rowRef Row index as shown in the view or row id (string)
 * @return {string}
 */
-Grid.prototype.getRowType = function(rowRef) {
+Grid_Grid.prototype.getRowType = function(rowRef) {
 	let rowDef = this.getRowDefinition(rowRef);
 	return rowDef ? rowDef.getType() : "";
 };
@@ -47899,7 +47926,7 @@ Grid.prototype.getRowType = function(rowRef) {
 * @param {number|string} rowRef Row index as shown in the view or row id (string)
 * @return {RowDefinition}
 */
-Grid.prototype.getRowDefinition = function(rowRef) {
+Grid_Grid.prototype.getRowDefinition = function(rowRef) {
 	if(typeof rowRef === "number") {
 		return this._getRowDefinitionByIndex(rowRef);
 	} else if(typeof rowRef === "string") {
@@ -47911,21 +47938,21 @@ Grid.prototype.getRowDefinition = function(rowRef) {
 * @param {number} rowIndex
 * @return {RowDefinition}
 */
-Grid.prototype._getRowDefinitionByIndex = function(rowIndex) {
+Grid_Grid.prototype._getRowDefinitionByIndex = function(rowIndex) {
 	return this._dv.getDataAt(rowIndex, ROW_DEF) || null;
 };
 /** @private
 * @param {string} rowId
 * @return {RowDefinition}
 */
-Grid.prototype._getRowDefinitionById = function(rowId) {
+Grid_Grid.prototype._getRowDefinitionById = function(rowId) {
 	return this._dt.getData(rowId, ROW_DEF) || null;
 };
 /** @private
 * @param {Grid~RowReference} rowRef
 * @return {RowDefinition}
 */
-Grid.prototype._getRowDefinitionByRef = function(rowRef) {
+Grid_Grid.prototype._getRowDefinitionByRef = function(rowRef) {
 	if(rowRef instanceof RowDefinition) {
 		if(rowRef.getRowId()) { // The row may have been removed from the grid
 			return /** @type{!RowDefinition} */(rowRef);
@@ -47939,14 +47966,14 @@ Grid.prototype._getRowDefinitionByRef = function(rowRef) {
 * @public
 * @return {!Array.<RowDefinition>}
 */
-Grid.prototype.getRowDefinitions = function() {
+Grid_Grid.prototype.getRowDefinitions = function() {
 	return this._dv.getColumnData(ROW_DEF, true); // Include group header rows
 };
 /** Get all row definitions, including filtered and hidden rows, but without group header rows.
 * @private
 * @return {!Array.<RowDefinition>}
 */
-Grid.prototype._getAllRowDefinitions = function() {
+Grid_Grid.prototype._getAllRowDefinitions = function() {
 	return this._dt.getColumnData(ROW_DEF); // no group header rows
 };
 
@@ -47955,7 +47982,7 @@ Grid.prototype._getAllRowDefinitions = function() {
 * @param {boolean=} inclAutoGenerated=false Set to true to include auto generated rows. Default value is false (exclude auto generated rows)
 * @return {!Array.<RowDefinition>}
 */
-Grid.prototype.getAllRowDefinitions = function(inclAutoGenerated) {
+Grid_Grid.prototype.getAllRowDefinitions = function(inclAutoGenerated) {
 	if(inclAutoGenerated) {
 		return this._getAllRowDefinitions();
 	}
@@ -47966,7 +47993,7 @@ Grid.prototype.getAllRowDefinitions = function(inclAutoGenerated) {
 * @param {number} rowIndex Row index as shown in the view
 * @return {Object} "FIELD1": value1, "FIELD2": value2, ...
 */
-Grid.prototype.getRowData = function(rowIndex) {
+Grid_Grid.prototype.getRowData = function(rowIndex) {
 	return toRowData(this._getRowDefinitionByIndex(rowIndex));
 };
 /** Get data from multiple rows. If null or undefined value is given, data from all rows are returned.
@@ -47979,7 +48006,7 @@ Grid.prototype.getRowData = function(rowIndex) {
 * grid.getMultipleRowData(1); // One row data from the specified row index is returned
 * grid.getMultipleRowData(DataView); // All row data from the specified DataView instance are returned
 */
-Grid.prototype.getMultipleRowData = function(obj) {
+Grid_Grid.prototype.getMultipleRowData = function(obj) {
 	if(typeof obj === "number") {
 		return [this.getRowData(obj)];
 	}
@@ -48013,7 +48040,7 @@ Grid.prototype.getMultipleRowData = function(obj) {
 * @param {string} ric
 * @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) {
+Grid_Grid.prototype.setRicData = function(ric, values) {
 	let rowDefs = this._connector.getRowDefByRic(ric);
 	let rowCount = rowDefs ? rowDefs.length : 0;
 	for (let i = 0; i < rowCount; ++i) {
@@ -48027,7 +48054,7 @@ Grid.prototype.setRicData = function(ric, values) {
 * @public
 * @return {Array.<string>}
 */
-Grid.prototype.getAllRics = function() {
+Grid_Grid.prototype.getAllRics = function() {
 	return this._connector.getAllRics();
 };
 
@@ -48035,7 +48062,7 @@ Grid.prototype.getAllRics = function() {
 * @public
 * @return {boolean}
 */
-Grid.prototype.hasRic = function() {
+Grid_Grid.prototype.hasRic = function() {
 	return this._connector.hasRic();
 };
 /** Returns RIC of given row reference.
@@ -48043,7 +48070,7 @@ Grid.prototype.hasRic = function() {
 * @param {(string|number)=} rowRef
 * @return {string}
 */
-Grid.prototype.getRic = function(rowRef) {
+Grid_Grid.prototype.getRic = function(rowRef) {
 	let rowDef = this.getRowDefinition(rowRef);
 	return rowDef.getRic();
 };
@@ -48052,7 +48079,7 @@ Grid.prototype.getRic = function(rowRef) {
 * @param {Grid~RowReference} rowRef
 * @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) {
+Grid_Grid.prototype.setRowData = function(rowRef, values) {
 	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.setRowData(values);
@@ -48064,7 +48091,7 @@ Grid.prototype.setRowData = function(rowRef, values) {
 * @param {Grid~RowReference} rowRef
 * @param {Object} values
 */
-Grid.prototype.setStaticRowData = function(rowRef, values) {
+Grid_Grid.prototype.setStaticRowData = function(rowRef, values) {
 	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.setStaticRowData(values);
@@ -48077,7 +48104,7 @@ Grid.prototype.setStaticRowData = function(rowRef, values) {
 * @param {string} field
 * @param {*} value
 */
-Grid.prototype.setStaticData = function(rowRef, field, value) {
+Grid_Grid.prototype.setStaticData = function(rowRef, field, value) {
 	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.setStaticData(field, value);
@@ -48088,7 +48115,7 @@ Grid.prototype.setStaticData = function(rowRef, field, value) {
 * @param {Grid~RowReference=} rowRef
 * @return {string}
 */
-Grid.prototype._getRowId = function(rowRef) {
+Grid_Grid.prototype._getRowId = function(rowRef) {
 	if(typeof rowRef === "string") {
 		return rowRef;
 	} else if(typeof rowRef === "number") { // WARNING: This is view index, excluding hidden row
@@ -48103,7 +48130,7 @@ Grid.prototype._getRowId = function(rowRef) {
 * @param {Grid~ColumnReference} colRef
 * @return {number}
 */
-Grid.prototype.getColumnIndex = function(colRef) {
+Grid_Grid.prototype.getColumnIndex = function(colRef) {
 	if(colRef) {
 		if(colRef instanceof ColumnDefinition) {
 			let colCount = this.getColumnCount();
@@ -48123,7 +48150,7 @@ Grid.prototype.getColumnIndex = function(colRef) {
 * @param {Array.<Grid~ColumnReference>} colRefs
 * @return {!Array.<number>}
 */
-Grid.prototype.getColumnIndices = function(colRefs) {
+Grid_Grid.prototype.getColumnIndices = function(colRefs) {
 	let ary = [];
 	let colCount = this.getColumnCount();
 	let inputAry = Array.isArray(colRefs) ? colRefs : [colRefs];
@@ -48143,14 +48170,14 @@ Grid.prototype.getColumnIndices = function(colRefs) {
 * @return {string} Return empty string if no existing id or column
 * @see {@link Grid#getColumnDefinition}
 */
-Grid.prototype.getColumnId = function(colIndex) {
+Grid_Grid.prototype.getColumnId = function(colIndex) {
 	return this._grid.getColumnId(colIndex);
 };
 /** Get ids from each column definition.
 * @public
 * @return {!Array.<string>} New array is created
 */
-Grid.prototype.getColumnIds = function() {
+Grid_Grid.prototype.getColumnIds = function() {
 	return this._grid.getColumnIds();
 };
 /** Return field defined in the column definition
@@ -48159,28 +48186,28 @@ Grid.prototype.getColumnIds = function() {
 * @return {string}
 * @see {@link Grid#getColumnDefinition}
 */
-Grid.prototype.getColumnField = function(colIndex) {
+Grid_Grid.prototype.getColumnField = function(colIndex) {
 	return this._grid.getColumnField(colIndex);
 };
 /** Get fields from each column definition. Note that this does not include any required field or data fields. Duplicates may exist.
 * @public
 * @return {!Array.<string>} New array is created
 */
-Grid.prototype.getColumnFields = function() {
+Grid_Grid.prototype.getColumnFields = function() {
 	return this._grid.getColumnFields();
 };
 /** Get column name from each column definition. Note that this does not include any required field or data fields. Duplicates may exist.
 * @public
 * @return {!Array.<string>} New array is created
 */
-Grid.prototype.getColumnNames = function() {
+Grid_Grid.prototype.getColumnNames = function() {
 	return this.getColumnDefinitions().map(_getName);
 };
 /** Get all fields, including required fields and data fields, with no duplicate
 * @public
 * @return {!Array.<string>} New array is created
 */
-Grid.prototype.getAllFields = function() {
+Grid_Grid.prototype.getAllFields = function() {
 	return this._connector.getAllFields();
 };
 /** Freeze the column at the left side of the table starting from index 0 to the specified colIndex
@@ -48189,7 +48216,7 @@ Grid.prototype.getAllFields = function() {
 * @param {number=} colIndex Negative index is equivalent to null value
 * @param {number=} pinnedRightColumns Number of columns to be pinned/snapped on the right side
 */
-Grid.prototype.freezeColumn = function(colIndex, pinnedRightColumns) {
+Grid_Grid.prototype.freezeColumn = function(colIndex, pinnedRightColumns) {
 	if(colIndex == null) {
 		colIndex = -1;
 	}
@@ -48203,7 +48230,7 @@ Grid.prototype.freezeColumn = function(colIndex, pinnedRightColumns) {
 * @param {string=} side Available values are: left|right. If no value is supplied, the column will be pinned to the left.
 * @return {boolean}
 */
-Grid.prototype.pinColumn = function(colRef, side) {
+Grid_Grid.prototype.pinColumn = function(colRef, side) {
 	if(Array.isArray(colRef)) {
 		let ary = colRef;
 		let len = ary.length;
@@ -48221,7 +48248,7 @@ Grid.prototype.pinColumn = function(colRef, side) {
 * @param {string=} side Available values are: left|right. If no value is supplied, the column will be pinned to the left.
 * @return {boolean}
 */
-Grid.prototype._pinColumn = function(colRef, side) {
+Grid_Grid.prototype._pinColumn = function(colRef, side) {
 	let colIndex = this.getColumnIndex(colRef);
 	let colCount = this.getColumnCount();
 	if(colIndex < 0 || colIndex > colCount) {
@@ -48270,7 +48297,7 @@ Grid.prototype._pinColumn = function(colRef, side) {
 * @param {Grid~ColumnReference=} dest The unpinned column will be placed before the destination position after the operation
 * @return {boolean}
 */
-Grid.prototype.unpinColumn = function(colRef, dest) {
+Grid_Grid.prototype.unpinColumn = function(colRef, dest) {
 	if(Array.isArray(colRef)) {
 		let ary = colRef;
 		let len = ary.length;
@@ -48288,7 +48315,7 @@ Grid.prototype.unpinColumn = function(colRef, dest) {
 * @param {Grid~ColumnReference=} dest The unpinned column will be placed before the destination position after the operation
 * @return {boolean}
 */
-Grid.prototype._unpinColumn = function(colRef, dest) {
+Grid_Grid.prototype._unpinColumn = function(colRef, dest) {
 	let colIndex = this.getColumnIndex(colRef);
 	if(colIndex < 0) {
 		return false;
@@ -48339,7 +48366,7 @@ Grid.prototype._unpinColumn = function(colRef, dest) {
 * @public
 * @return {boolean}
 */
-Grid.prototype.unpinAllColumns = function() {
+Grid_Grid.prototype.unpinAllColumns = function() {
 	let leftPinnedCount = this._grid.getPinnedLeftColumnCount();
 	let rightPinnedCount = this._grid.getPinnedRightColumnCount();
 	if(!leftPinnedCount && !rightPinnedCount) {
@@ -48352,7 +48379,7 @@ Grid.prototype.unpinAllColumns = function() {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onColumnHeaderBinding = function(e) {
+Grid_Grid.prototype._onColumnHeaderBinding = function(e) {
 	if(e["sectionType"] !== "title" || e["sectionIndex"] > 0) {
 		return; // WARNING: Assume that only the first title section is owned by the grid. Anything else is assumed to be generated by plugins
 	}
@@ -48367,7 +48394,7 @@ Grid.prototype._onColumnHeaderBinding = function(e) {
 * @param {number=} colIndex
 * @param {Object} arg
 */
-Grid.prototype._renderColumnHeader = function(colIndex, arg) {
+Grid_Grid.prototype._renderColumnHeader = function(colIndex, arg) {
 	let colDef = this.getColumnDefinition(colIndex);
 	if(!colDef) {
 		return;
@@ -48401,7 +48428,7 @@ Grid.prototype._renderColumnHeader = function(colIndex, arg) {
 };
 /** @public
 */
-Grid.prototype.updateColumnTitle = function() {
+Grid_Grid.prototype.updateColumnTitle = function() {
 	if(this._columnTitleConflator.conflate()) {
 		return;
 	}
@@ -48413,31 +48440,31 @@ Grid.prototype.updateColumnTitle = function() {
 /** @public
 * @return {boolean}
 */
-Grid.prototype.isSorting = function() {
+Grid_Grid.prototype.isSorting = function() {
 	return this._stp.isSorting();
 };
 /** @public
 * @return {number}
 */
-Grid.prototype.getSortedColumnIndex = function() {
+Grid_Grid.prototype.getSortedColumnIndex = function() {
 	return this._stp.getSortedColumnIndex();
 };
 /** @public
 * @return {string} "a" for "ascending, "d" for descending, and "n" for none/noOrder
 */
-Grid.prototype.getSortOrder = function() {
+Grid_Grid.prototype.getSortOrder = function() {
 	return this._stp.getSortOrder();
 };
 /** @public
 */
-Grid.prototype.clearSort = function() {
+Grid_Grid.prototype.clearSort = function() {
 	this._stp.clearSortState(); // WARNING: No event is dispatched
 };
 /** Get sorting states from sorting columns
 * @public
 * @return {!Array.<Object>} Array of sorting states ordered by priority. If there is no sorting column, an empty array is returned
 */
-Grid.prototype.getSortingStates = function () { // This method is mainly for backward compatability
+Grid_Grid.prototype.getSortingStates = function () { // This method is mainly for backward compatability
 	let ary = [];
 	let states = this._stp.getSortingStates();
 	let stateCount = states.length;
@@ -48460,7 +48487,7 @@ Grid.prototype.getSortingStates = function () { // This method is mainly for bac
 * @private
 * @param {Object} e Event object from quote2
 */
-Grid.prototype._onQuote2PostUpdate = function (e) {
+Grid_Grid.prototype._onQuote2PostUpdate = function (e) {
 	if(e.childOrderChange) { // For dynamic chain when CHILD_ORDER from the server change, it will be call sort children
 		if(!this.isSorting()) {
 			// Use rowDef for get CHILD_ORDER to sort
@@ -48473,7 +48500,7 @@ Grid.prototype._onQuote2PostUpdate = function (e) {
 * @private
 * @param {Object} e
  */
-Grid.prototype._onQ2DataChanged = function (e) {
+Grid_Grid.prototype._onQ2DataChanged = function (e) {
 	let rowDef = this._getRowDefinitionById(e["subId"]);
 	if(!rowDef) {
 		return; // WARNING: This should not be happened because row has been removed but the data is still received
@@ -48521,7 +48548,7 @@ Grid.prototype._onQ2DataChanged = function (e) {
 /** @private
 * @param {RowDefinition} rowDef
 */
-Grid.prototype._registerConstituents = function(rowDef) {
+Grid_Grid.prototype._registerConstituents = function(rowDef) {
 	if(this._chainConflator.conflate(rowDef)) {
 		return;
 	}
@@ -48595,12 +48622,22 @@ Grid.prototype._registerConstituents = function(rowDef) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onDataChanged = function(e) {
-	if(this._dt && e && e["rid"] && e["changes"]) {
-		let rowDef = this._getRowDefinitionById(e["rid"]);
-		if(rowDef) {
-			if(rowDef.addUpdate(e["changes"])) { // 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
+Grid_Grid.prototype._onDataChanged = function(e) {
+	if(!this._dt) {
+		return;
+	}
+	if(e) {
+		if(e["initialChanges"] && !this._dt.hasSegmentClassification()) {
+			return;
+		}
+
+		// TODO: Insertion should also be addressed here.
+		if(e["rid"] && e["changes"]) {
+			let rowDef = this._getRowDefinitionById(e["rid"]);
+			if(rowDef) {
+				if(rowDef.addUpdate(e["changes"])) { // This is the only place that update array can grow. It is used for blinking data.
+					this._hasNewUpdates = true; // Mark data table for cleaning it up later
+				}
 			}
 		}
 	}
@@ -48609,16 +48646,14 @@ Grid.prototype._onDataChanged = function(e) {
 		return;
 	}
 
-	if(this._dt) {
-		this._dt.classifySegments();
-		this._dt.dispatchGlobalChange();
-	}
+	this._dt.classifySegments();
+	this._dt.dispatchGlobalChange();
 };
 
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onPreDataSorting = function (e) {
+Grid_Grid.prototype._onPreDataSorting = function (e) {
 	let objs = this._stp.getSortedColumns();
 
 	this._sorter.reset();
@@ -48654,29 +48689,30 @@ Grid.prototype._onPreDataSorting = function (e) {
 * @param {number} order
 * @return {number}
 */
-Grid.prototype._mainSorter = function (rowDefA, rowDefB, order) {
+Grid_Grid.prototype._mainSorter = function (rowDefA, rowDefB, order) {
 	return this._columnSorter(rowDefA, rowDefB, order);
 };
 
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onPostSectionDataBinding = function(e) {
+Grid_Grid.prototype._onPostSectionDataBinding = function(e) {
 	if(e["actualUpdate"]) {
 		this._asyncClearDataUpdates();
 	}
 };
 /** @private
 */
-Grid.prototype._asyncClearDataUpdates = function() {
+Grid_Grid.prototype._asyncClearDataUpdates = function() {
 	setTimeout(this._clearDataUpdates, 0);
 };
 /** @private
 */
-Grid.prototype._clearDataUpdates = function() {
-	if(!this._dt || !this._dt._hasNewUpdates) {
+Grid_Grid.prototype._clearDataUpdates = function() {
+	if(!this._dt || !this._hasNewUpdates) {
 		return;
 	}
+	this._hasNewUpdates = false;
 	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]);
@@ -48688,38 +48724,38 @@ Grid.prototype._clearDataUpdates = function() {
 /** @public
 * @return {DataView}
 */
-Grid.prototype.getDataView = function() {
+Grid_Grid.prototype.getDataView = function() {
 	return this._dv;
 };
 /** @public
 * @param {number} pageIndex
 * @return {boolean}
 */
-Grid.prototype.setPage = function(pageIndex) {
+Grid_Grid.prototype.setPage = function(pageIndex) {
 	return this._dv.setPage(pageIndex);
 };
 /** @public
 * @param {number} size
 */
-Grid.prototype.setPageSize = function(size) {
+Grid_Grid.prototype.setPageSize = function(size) {
 	this._dv.setPageSize(size);
 };
 /** @public
 * @return {number}
 */
-Grid.prototype.getPageIndex = function() {
+Grid_Grid.prototype.getPageIndex = function() {
 	return this._dv.getPageIndex();
 };
 /** @public
 * @return {number}
 */
-Grid.prototype.getPageSize = function() {
+Grid_Grid.prototype.getPageSize = function() {
 	return this._dv.getPageSize();
 };
 /** @public
 * @return {number}
 */
-Grid.prototype.getPageCount = function() {
+Grid_Grid.prototype.getPageCount = function() {
 	return this._dv.getPageCount();
 };
 
@@ -48727,7 +48763,7 @@ Grid.prototype.getPageCount = function() {
  * @public
  * @param {Grid~RowReference} rowRef
  */
-Grid.prototype.toggleChain = function(rowRef) {
+Grid_Grid.prototype.toggleChain = function(rowRef) {
 	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		rowDef.toggleChain();
@@ -48739,7 +48775,7 @@ Grid.prototype.toggleChain = function(rowRef) {
  * @param {Array.<string>} fields
  * @return {boolean}
  */
-Grid.prototype.setClassification = function(rowRef, fields) {
+Grid_Grid.prototype.setClassification = function(rowRef, fields) {
 	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
 		return this._dt.setSegmentClassification(rowDef.getRowId(), fields);
@@ -48752,7 +48788,7 @@ Grid.prototype.setClassification = function(rowRef, fields) {
  * @param {Element} elem
  * @return {boolean}=true if an element from the parameter is inside a grid element
  */
-Grid.prototype.contains = function(elem) {
+Grid_Grid.prototype.contains = function(elem) {
 	if(elem) {
 		// This will impact the contents within the rt-grid element, but not those outside of it, such as the wrapper elements atlas-blotter and ef-grid.
 		return this._topNode.contains(elem);
@@ -48764,7 +48800,7 @@ Grid.prototype.contains = function(elem) {
  * @public
  * @return {boolean}
  */
-Grid.prototype.isFocused = function() {
+Grid_Grid.prototype.isFocused = function() {
 	let activeElement = document.activeElement;
 	if(!activeElement || !activeElement.shadowRoot) {
 		// active element is not in the shadow DOM. try using contains method to check
@@ -48776,19 +48812,19 @@ Grid.prototype.isFocused = function() {
 /** @description Focus grid element without moving window scrollbar
  * @public
  */
-Grid.prototype.focus = function() {
+Grid_Grid.prototype.focus = function() {
 	this._grid.focus();
 };
 /** Request re-rendering of content row by triggering data binding event without any change in data model
  * @public
  */
-Grid.prototype.requestRowRefresh = function() {
+Grid_Grid.prototype.requestRowRefresh = function() {
 	this._grid.requestRowRefresh();
 };
 /** Force recalculation of grid's layout
  * @public
  */
-Grid.prototype.updateLayout = function() {
+Grid_Grid.prototype.updateLayout = function() {
 	this._grid.updateLayout();
 };
 /** Get extension instance
@@ -48796,7 +48832,7 @@ Grid.prototype.updateLayout = function() {
 * @param {string} str Extension name
 * @return {*} Returns null, if the specified extension does not exist
 */
-Grid.prototype.getExtension = function(str) {
+Grid_Grid.prototype.getExtension = function(str) {
 	if(str) {
 		return this._grid.getPlugin(str.replace(/Extension/ig, ""));
 	}
@@ -48806,7 +48842,7 @@ Grid.prototype.getExtension = function(str) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onFormulaDataChanged = function(e) {
+Grid_Grid.prototype._onFormulaDataChanged = function(e) {
 	if (this._formulaConflator.conflate()) {
 		return;
 	}
@@ -48818,7 +48854,7 @@ Grid.prototype._onFormulaDataChanged = function(e) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onFormulaDataRequired = function(e) {
+Grid_Grid.prototype._onFormulaDataRequired = function(e) {
 	// if(obj["field"]) {
 	// this._registerFieldToDataProvider(obj); TODO
 	// if(this._dataRequiredTimerId) {
@@ -48831,10 +48867,14 @@ Grid.prototype._onFormulaDataRequired = function(e) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onDataComposed = function(e) {
+Grid_Grid.prototype._onDataComposed = function(e) {
 	let values = e["changes"];
 	if(!values) {
-		return; // Cannot do data composition if there is no change in data
+		if(e["initialChanges"]) {
+			values = e["changes"] = e["initialChanges"]; // Need to keep e["changes"] for backward compatibility.
+		} else {
+			return; // Cannot do data composition if there is no change in data
+		}
 	}
 
 	if(!e["rowData"]) {
@@ -48842,7 +48882,7 @@ Grid.prototype._onDataComposed = function(e) {
 	}
 
 	let rowId = e["rid"];
-	let rowDef = this._getRowDefinitionById(rowId);
+	let rowDef = e["rowDef"] || this._getRowDefinitionById(rowId);
 	if(!rowDef) {
 		rowDef = this._constituentMap ? this._constituentMap[rowId] : null; // Row def could be in pending for adding to view
 		if(!rowDef) {
@@ -48884,7 +48924,7 @@ Grid.prototype._onDataComposed = function(e) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onSubSegmentChanged = function(e) {
+Grid_Grid.prototype._onSubSegmentChanged = function(e) {
 	let insertionList = /** @type{Array.<Segment>} */(e["insertionList"]);
 	let removalList = /** @type{Array.<string>} */(e["removalList"]);
 	let removedRows = /** @type{Object} */(e["removedRows"]);
@@ -48912,15 +48952,17 @@ Grid.prototype._onSubSegmentChanged = function(e) {
 		rowDef = new RowDefinition({
 			"segmentId": segmentId // WARNING: This could cause row id duplication
 		});
+		if(rowDef.setDataSource(this._dc)) { // auto generated row does not require a subscription
+			this._hasNewUpdates = true; // Mark data table for cleaning it up later
+		}
 		rowDef.registerToView(this._dv);
-		rowDef.setDataSource(this._dc); // auto generated row does not require a subscription
 	}
 };
 
 /** @private
 * @param {Object=} e
 */
-Grid.prototype._recalculateFormulas = function(e) {
+Grid_Grid.prototype._recalculateFormulas = function(e) {
 	if(!this._fnEngine || this._fnEngine.getFormulaCount() <= 0) {
 		return;
 	}
@@ -48940,7 +48982,7 @@ Grid.prototype._recalculateFormulas = function(e) {
 /** @private
 * @param {Object} e The updated data from snapshot filler when it request data from JET/RTK
 */
-Grid.prototype._snapshotFillerDataChanged = function (e) {
+Grid_Grid.prototype._snapshotFillerDataChanged = function (e) {
 	if (!this._dt) return;
 
 	let data = e.data;
@@ -48959,7 +49001,7 @@ Grid.prototype._snapshotFillerDataChanged = function (e) {
 };
 /** @private
 */
-Grid.prototype._startPolling = function () {
+Grid_Grid.prototype._startPolling = function () {
 	if(this._pollingEnabled && this._pollingInterval) {
 		if(this._lastPollingRequest && !this._pollingTimerId) {
 			let now = new Date();
@@ -48970,7 +49012,7 @@ Grid.prototype._startPolling = function () {
 };
 /** @private
 */
-Grid.prototype._onPollingInterval = function () {
+Grid_Grid.prototype._onPollingInterval = function () {
 	this._pollingTimerId = 0;
 	if(this._pollingEnabled && this._pollingInterval) {
 		this.refreshADCData();
@@ -48980,7 +49022,7 @@ Grid.prototype._onPollingInterval = function () {
 /** @public
 * @param {boolean=} activated=true
 */
-Grid.prototype.activateADCPolling = function (activated) {
+Grid_Grid.prototype.activateADCPolling = function (activated) {
 	if(activated !== false) {
 		this._pollingEnabled = true;
 		// Make immediate request after re-activation if it has been a long time
@@ -49000,7 +49042,7 @@ Grid.prototype.activateADCPolling = function (activated) {
 * @public
 * @return {boolean} Return true, if a request has been made
 */
-Grid.prototype.refreshADCData = function () {
+Grid_Grid.prototype.refreshADCData = function () {
 	let dirty = this._snapshot.addFields(this._connector.getAllFields());
 	if(dirty) {
 		dirty = this._snapshot.addRics(this._connector.getAllRics());
@@ -49014,7 +49056,7 @@ Grid.prototype.refreshADCData = function () {
 
 /** @private
 */
-Grid.prototype._onAutoLayoutUpdate = function() {
+Grid_Grid.prototype._onAutoLayoutUpdate = function() {
 	let elem = this._topNode;
 
 	let cw = elem.clientWidth;
@@ -49028,7 +49070,7 @@ Grid.prototype._onAutoLayoutUpdate = function() {
  * @public
  * @param {Object=} opt_options { "colNames": Array.<string>, "rowCount": number, "startIndex": number, "getter": function(Object, string):* }
  */
-Grid.prototype.logDT = function(opt_options) {
+Grid_Grid.prototype.logDT = function(opt_options) {
 	let rowDefs = this._getAllRowDefinitions();
 	this._logData(rowDefs, opt_options);
 };
@@ -49046,7 +49088,7 @@ Grid.prototype.logDT = function(opt_options) {
 // }
 grid.logDV({"rowCount": 10}); // Showing 10 records
  */
-Grid.prototype.logDV = function(opt_options) {
+Grid_Grid.prototype.logDV = function(opt_options) {
 	let rowDefs = this.getRowDefinitions();
 	this._logData(rowDefs, opt_options);
 };
@@ -49055,7 +49097,7 @@ Grid.prototype.logDV = function(opt_options) {
  * @param {!Array.<RowDefinition>} rowDefs
  * @param {Object=} options
  */
-Grid.prototype._logData = function(rowDefs, options) {
+Grid_Grid.prototype._logData = function(rowDefs, options) {
 	if(!options) {
 		options = {};
 	}
@@ -49076,7 +49118,7 @@ Grid.prototype._logData = function(rowDefs, options) {
 * @param {(RowDefinition~Options|string)=} rowOption
 * @returns {RowDefinition} Returns null, if the row is not replaced. Otherwise, a newly created row is returned
 */
-Grid.prototype.replaceRow = function(rowRef, rowOption) {
+Grid_Grid.prototype.replaceRow = function(rowRef, rowOption) {
 	let insertPos = this._getRowId(rowRef);
 	let rowDef = this._getRowDefinitionById(insertPos);
 
@@ -49108,7 +49150,7 @@ Grid.prototype.replaceRow = function(rowRef, rowOption) {
 * @param {boolean=} leftOfView Default is false. If true, the specified column will be put at the leftmost of the view (no offset)
 * @returns {boolean} Return true, if there is any change
 */
-Grid.prototype.scrollToColumn = function (colIndex, leftOfView) {
+Grid_Grid.prototype.scrollToColumn = function (colIndex, leftOfView) {
 	return this._grid.scrollToColumn(colIndex, leftOfView);
 };
 /** Scroll the view to the specified row. If the row is already in the view, nothing happens. If the row is outside of the view, the view will be moved to the row with some additional offsets
@@ -49116,7 +49158,7 @@ Grid.prototype.scrollToColumn = function (colIndex, leftOfView) {
 * @param {number} rowIndex
 * @param {boolean=} topOfView=false If true, the specified row will be put at the top of the view (no offset)
 */
-Grid.prototype.scrollToRow = function (rowIndex, topOfView) {
+Grid_Grid.prototype.scrollToRow = function (rowIndex, topOfView) {
 	this._grid.scrollToRow("content", rowIndex, topOfView);
 };
 
@@ -49124,14 +49166,14 @@ Grid.prototype.scrollToRow = function (rowIndex, topOfView) {
 * @public
 * @returns {number} pixels
 */
-Grid.prototype.getScrollLeft = function () {
+Grid_Grid.prototype.getScrollLeft = function () {
 	return this._grid.getScrollLeft();
 };
 /** Get scroll value in pixel from the vertical scrollbar
 * @public
 * @returns {number} pixels
 */
-Grid.prototype.getScrollTop = function () {
+Grid_Grid.prototype.getScrollTop = function () {
 	return this._grid.getScrollTop();
 };
 
@@ -49140,7 +49182,7 @@ Grid.prototype.getScrollTop = function () {
 * @param {number} pixels
 * @see {@link Grid.scrollRight}
 */
-Grid.prototype.setScrollLeft = function (pixels) {
+Grid_Grid.prototype.setScrollLeft = function (pixels) {
 	this._grid.setScrollLeft(pixels);
 };
 /** Set scroll value to the vertical scrollbar. This will move the scrollbar to specific position
@@ -49148,7 +49190,7 @@ Grid.prototype.setScrollLeft = function (pixels) {
 * @param {number} pixels
 * @see {@link Grid.scrollDown}
 */
-Grid.prototype.setScrollTop = function (pixels) {
+Grid_Grid.prototype.setScrollTop = function (pixels) {
 	this._grid.setScrollTop(pixels);
 };
 
@@ -49157,7 +49199,7 @@ Grid.prototype.setScrollTop = function (pixels) {
 * @param {number} pixels
 * @see {@link Grid.setScrollLeft}
 */
-Grid.prototype.scrollRight = function (pixels) {
+Grid_Grid.prototype.scrollRight = function (pixels) {
 	this._grid.scrollRight(pixels);
 };
 /** Scroll the view down by the specified value. Use negative value to scroll the view to the top
@@ -49165,7 +49207,7 @@ Grid.prototype.scrollRight = function (pixels) {
 * @param {number} pixels
 * @see {@link Grid.setScrollTop}
 */
-Grid.prototype.scrollDown = function (pixels) {
+Grid_Grid.prototype.scrollDown = function (pixels) {
 	this._grid.scrollDown(pixels);
 };
 
@@ -49173,14 +49215,14 @@ Grid.prototype.scrollDown = function (pixels) {
 * @public
 * @returns {number}
 */
-Grid.prototype.getScrollWidth = function () {
+Grid_Grid.prototype.getScrollWidth = function () {
 	return this._grid.getScrollWidth();
 };
 /** Get height of scrollable area from the vertical scrollbar. This is useful for determining the end of scrollbar
 * @public
 * @returns {number}
 */
-Grid.prototype.getScrollHeight = function () {
+Grid_Grid.prototype.getScrollHeight = function () {
 	return this._grid.getScrollHeight();
 };
 
@@ -49188,7 +49230,7 @@ Grid.prototype.getScrollHeight = function () {
 * @public
 * @returns {Object} Returns null, if vertical scrollbar does not exists
 */
-Grid.prototype.getVScrollView = function () {
+Grid_Grid.prototype.getVScrollView = function () {
 	return this._grid.getVScrollView();
 };
 
@@ -49197,7 +49239,7 @@ Grid.prototype.getVScrollView = function () {
 * @param {Object} args
 * @return {boolean}
 */
-Grid.prototype._focusCell = function(cell, args) {
+Grid_Grid.prototype._focusCell = function(cell, args) {
 	if(cell) {
 		let cellContent = cell.getContent();
 		if(cellContent) {
@@ -49228,7 +49270,7 @@ Grid.prototype._focusCell = function(cell, args) {
 };
 /** @private
 */
-Grid.prototype._onVScroll = function() {
+Grid_Grid.prototype._onVScroll = function() {
 	let args = this._focusingArgs;
 	if(args) {
 		args.timeoutId = _clearTimeout(args.timeoutId);
@@ -49245,12 +49287,12 @@ Grid.prototype._onVScroll = function() {
 };
 /** @private
 */
-Grid.prototype._onScrollTimeout = function() {
+Grid_Grid.prototype._onScrollTimeout = function() {
 	this._focusingArgs = null;
 };
 /** @private
 */
-Grid.prototype._selfScrollToRow = function() {
+Grid_Grid.prototype._selfScrollToRow = function() {
 	let args = this._focusingArgs;
 	if(args) {
 		args.id = 0;
@@ -49260,7 +49302,7 @@ Grid.prototype._selfScrollToRow = function() {
 /** @private
 * @param {Object} args
 */
-Grid.prototype._requestScroll = function(args) {
+Grid_Grid.prototype._requestScroll = function(args) {
 	if(!this._focusingArgs) {
 		this._focusingArgs = args;
 		args.event = null; // The event is invalid after the scroll
@@ -49271,7 +49313,7 @@ Grid.prototype._requestScroll = function(args) {
 /** @private
 * @param {Object} args
 */
-Grid.prototype._focusNextCellContent = function(args) {
+Grid_Grid.prototype._focusNextCellContent = function(args) {
 	let colIndex = args.colIndex;
 	let rowIndex = args.rowIndex;
 	if(rowIndex < 0 || rowIndex == null) {
@@ -49324,7 +49366,7 @@ Grid.prototype._focusNextCellContent = function(args) {
 /** @private
 * @param {Object} args
 */
-Grid.prototype._focusPrevCellContent = function(args) {
+Grid_Grid.prototype._focusPrevCellContent = function(args) {
 	let colIndex = args.colIndex;
 	let rowIndex = args.rowIndex;
 	if(rowIndex < 0 || rowIndex == null) {
@@ -49377,7 +49419,7 @@ Grid.prototype._focusPrevCellContent = function(args) {
 /** @private
 * @param {Object} e
 */
-Grid.prototype._onTabNavigation = function(e) {
+Grid_Grid.prototype._onTabNavigation = function(e) {
 	if(this._focusingArgs) {
 		return; // Cannot do another tab navigation while waiting for scrolling
 	}
@@ -49423,7 +49465,7 @@ Grid.prototype._onTabNavigation = function(e) {
 * @ignore
 * @return {!Object}
 */
-Grid.prototype._getEventHandlers = function() {
+Grid_Grid.prototype._getEventHandlers = function() {
 	return {
 		"tabNavigation": this._onTabNavigation,
 		"q2DataChanged": this._onQ2DataChanged
@@ -49431,9 +49473,9 @@ Grid.prototype._getEventHandlers = function() {
 };
 
 
-/* harmony default export */ var js_Grid = (Grid);
+/* harmony default export */ const js_Grid = ((/* unused pure expression or super */ null && (Grid_Grid)));
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/DataSet.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/DataSet.js
 /**
 * @namespace
 */
@@ -49824,10 +49866,10 @@ DataSet.country = [
 	{"name": "Zimbabwe", "code": "ZW"}
 ];
 
-/* harmony default export */ var jet_DataSet = (DataSet);
+/* harmony default export */ const jet_DataSet = (DataSet);
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/DataGenerator.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/DataGenerator.js
 
 
 /** @typedef {Object} DataGenerator~DataOptions
@@ -50663,10 +50705,10 @@ DataGenerator.randString = randString;
 DataGenerator.toRecords = toRecords;
 
 
-/* harmony default export */ var jet_DataGenerator = (DataGenerator);
+/* harmony default export */ const jet_DataGenerator = ((/* unused pure expression or super */ null && (DataGenerator)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockQuotes.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockQuotes.js
 
 
 /** @constructor */
@@ -50867,7 +50909,7 @@ MockSubscription.prototype._getUpdateData = function(ric) {
 
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/CollectionDict.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/CollectionDict.js
 /** @description CollectionDict stores a collection (Array) of any value using a text (string) as a key for accessing the collection.
 * @constructor
 */
@@ -51017,10 +51059,10 @@ CollectionDict.prototype.getAllKeys = function() {
 	return Object.keys(this._dict);
 };
 
-/* harmony default export */ var jet_CollectionDict = (CollectionDict);
+/* harmony default export */ const jet_CollectionDict = ((/* unused pure expression or super */ null && (CollectionDict)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockQuotes2.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockQuotes2.js
 
 
 
@@ -51882,7 +51924,7 @@ MockSubscriptions.prototype._statusMap = {
 
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockArchive.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockArchive.js
 /** @constructor */
 let MockArchive = function() {
 	this._data = {};
@@ -51940,7 +51982,7 @@ MockArchive.prototype.filter = function(func) {
 
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockUtil.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockUtil.js
 /**
 * @public
 * @type {Object}
@@ -51967,7 +52009,7 @@ function setInvalidFields(fields) {
 
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/Adc.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/Adc.js
 
 
 
@@ -52237,7 +52279,7 @@ Adc.splitFields = function(strFields) {
 
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/mockDataAPI.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/mockDataAPI.js
 
 
 
@@ -52350,7 +52392,7 @@ mockDataAPI.setInvalidFields = setInvalidFields;
 
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockJET.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/MockJET.js
 
 
 
@@ -52420,10 +52462,10 @@ MockJET.prototype.getUserInfo = function() {
 MockJET.prototype.contextChange = function(contextAry) {
 };
 
-/* harmony default export */ var jet_MockJET = (MockJET);
+/* harmony default export */ const jet_MockJET = ((/* unused pure expression or super */ null && (MockJET)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/TickCodes.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/TickCodes.js
 /** @type {Object.<string, number>}
 * @public
 */
@@ -52455,10 +52497,10 @@ let TickFields = {
 	"ASK_TICK": 1
 };
 
-/* harmony default export */ var es6_TickCodes = (TickCodes);
+/* harmony default export */ const es6_TickCodes = ((/* unused pure expression or super */ null && (TickCodes)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/ExpressionParser.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/ExpressionParser.js
 /** @type {Object.<string, number>}
 * @private
 * @const
@@ -52865,10 +52907,10 @@ ExpressionParser.parse = function(expression) {
 	return ExpressionParser._filter.bind(null, ctx);
 };
 
-/* harmony default export */ var es6_ExpressionParser = (ExpressionParser);
+/* harmony default export */ const es6_ExpressionParser = ((/* unused pure expression or super */ null && (ExpressionParser)));
 
 
-// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/CellPainter.js
+;// CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/CellPainter.js
 
 
 
@@ -54073,10 +54115,10 @@ CellPainter.prototype.setBlinkingDuration = function(duration) {
 	}
 };
 
-/* harmony default export */ var es6_CellPainter = (CellPainter);
+/* harmony default export */ const es6_CellPainter = ((/* unused pure expression or super */ null && (CellPainter)));
 
 
-// CONCATENATED MODULE: ./src/index.js
+;// CONCATENATED MODULE: ./src/index.js
 /* eslint-disable */
 
 /* eslint-enable */
@@ -54110,7 +54152,7 @@ if (window) {
 		trNamespace.CellPainter = CellPainter;
 	}
 	if(!rtNamespace['Grid']) {
-		rtNamespace.Grid = Grid;
+		rtNamespace.Grid = Grid_Grid;
 	}
 	if(!gridNamespace['CellPainter']) {
 		gridNamespace.CellPainter = CellPainter;
@@ -54119,8 +54161,7 @@ if (window) {
 // tsd-enable
 
 
-/* harmony default export */ var src_0 = __webpack_exports__["default"] = (Grid);
-
+/* harmony default export */ const src = ((/* unused pure expression or super */ null && (Grid)));
 
-/***/ })
-/******/ ]);
+/******/ })()
+;