diff --git a/Combobox.js b/Combobox.js
index 82d0c139dd..3ce9b3d6f8 100644
--- a/Combobox.js
+++ b/Combobox.js
@@ -204,7 +204,10 @@ define([
 		list: null,
 
 		// Flag used for binding the readonly attribute of the input element in the template
-		_inputReadOnly: true,
+		_inputReadOnly: false,
+
+		// Flag used to track when the inputNode has to be updated in order to set the readonly attribute.
+		_updateInputReadOnly: false,
 
 		/**
 		 * The value of the placeholder attribute of the input element used
@@ -283,11 +286,20 @@ define([
 		minFilterChars: 1,
 
 		/**
-		 * Displayed value, when Combobox.value is set at the creation time.
+		 * InputNode's value. Can be used to display something at the creation time. After that,
+		 * each user interaction will override this with the selected item label.
 		 * @type {string}
 		 */
 		displayedValue: "",
 
+		// Flag used for skipping consecutive validations, if one already run.
+		_justValidated: false,
+
+		// Flag used for post initializing the widget value, if the list has not been created yet.
+		_processValueAfterListInit: false,
+
+		_isMobile: !!ComboPopup,
+
 		createdCallback: function () {
 			// Declarative case (list specified declaratively inside the declarative Combobox)
 			var list = this.querySelector("d-list");
@@ -305,14 +317,14 @@ define([
 
 			this.on("click", function () {
 				// NOTE: This runs only when in mobile mode
-				if (this._useCenteredDropDown() && !this.disabled) {
+				if (this._isMobile && !this.disabled) {
 					this.openDropDown();
 				}
 			}.bind(this));
 
 			this.on("mousedown", function (evt) {
 				// NOTE: This runs only when in desktop mode
-				if (!this._useCenteredDropDown() && (!this.minFilterChars || this._inputReadOnly)) {
+				if (!this._isMobile && (!this.minFilterChars || this._inputReadOnly)) {
 					// event could be triggered by the down arrow element. If so, we do not react to it.
 					if (evt.srcElement !== this.buttonNode && !this.disabled) {
 						if (!this.opened) {
@@ -374,70 +386,54 @@ define([
 
 		/* jshint maxcomplexity: 17 */
 		refreshRendering: function (oldValues) {
-			var updateReadOnly = false;
-			if ("list" in oldValues) {
+			if ("list" in oldValues && this.list) {
 				this._initList();
 			}
 			if ("selectionMode" in oldValues) {
-				updateReadOnly = true;
 				if (this.list) {
 					this.list.selectionMode = this.selectionMode === "single" ?
 						"radio" : "multiple";
 				}
 			}
-			if ("autoFilter" in oldValues ||
-				"readOnly" in oldValues) {
-				updateReadOnly = true;
-			}
-			if (updateReadOnly) {
-				this._updateInputReadOnly();
-				this._setSelectable(this.inputNode, !this.inputNode.readOnly);
-			}
-			if ("value" in oldValues) {
-				if (!this._justValidated) {
-					this._validateInput(false, true);
+			if ("autoFilter" in oldValues || "selectionMode" in oldValues ||
+				"readOnly" in oldValues || "source" in oldValues || "_updateInputReadOnly" in oldValues) {
+				this._updateInputReadOnly = false;
+
+				this._inputReadOnly = this.hasDownArrow ? this._isSourceEmpty() ||
+					this.readOnly || !this.autoFilter || this.selectionMode === "multiple" : false;
+
+				this.inputNode.readOnly = this._inputReadOnly || this._isMobile ? "readonly" : "";
+
+				if (this._inputReadOnly) {
+					this.inputNode.setAttribute("unselectable", "on");
+					$(this.inputNode)
+						.css("user-select", "none") // maps to WebkitUserSelect, etc.
+						.on("selectstart", false);
 				} else {
-					delete this._justValidated;
+					this.inputNode.removeAttribute("unselectable");
+					$(this.inputNode)
+						.css("user-select", "") // maps to WebkitUserSelect, etc.
+						.off("selectstart", false);
 				}
 			}
 		},
 
-		/**
-		 * Updates the value of the private property on which the Combobox template
-		 * binds the `readonly` attribute of the input element.
-		 * @private
-		 */
-		_updateInputReadOnly: function () {
-			var oldValue = this._inputReadOnly;
-			this._inputReadOnly = this.readOnly || !this.autoFilter ||
-				this._useCenteredDropDown() || this.selectionMode === "multiple";
-			if (this._inputReadOnly === oldValue) {
-				// FormValueWidget.refreshRendering() mirrors the value of widget.readOnly
-				// to focusNode.readOnly, thus competing with the binding of the readOnly
-				// attribute of the input node (which is also the focusNode attach point)
-				// in the template of Combobox. To ensure the refresh of the binding is done
-				// including when the value of the flag _inputReadOnly doesn't change while
-				// FormValueWidget has reset the attribute to a different value, force
-				// the notification:
-				this.notifyCurrentValue("_inputReadOnly");
-			} // else no need to notify "by hand", rely on automatic notification
-		},
-
-		/**
-		 * Configures inputNode such that the text is selectable or unselectable.
-		 * @private
-		 */
-		_setSelectable: function (inputNode, selectable) {
-			if (selectable) {
-				inputNode.removeAttribute("unselectable");
-				$(inputNode)
-					.css("user-select", "") // maps to WebkitUserSelect, etc.
-					.off("selectstart", false);
-			} else {
-				inputNode.setAttribute("unselectable", "on");
-				$(inputNode)
-					.css("user-select", "none") // maps to WebkitUserSelect, etc.
-					.on("selectstart", false);
+		computeProperties: function (oldValues) {
+			if ("value" in oldValues) {
+				if (!this._justValidated) {
+					if (this.list) {
+						// INFO: if list is already created and attached, then we can validate the `value` value
+						this._validateInput(false);
+					} else {
+						// INFO: otherwise we have to delay its evaluation.
+						this._processValueAfterListInit = true;
+					}
+				}
+			}
+			if ("_justValidated" in oldValues) {
+				if (this._justValidated) {
+					this._justValidated = false;
+				}
 			}
 		},
 
@@ -452,31 +448,34 @@ define([
 		},
 
 		_initList: function () {
-			if (this.list) {
-				// TODO
-				// This is a workaround waiting for a proper mechanism (at the level
-				// of delite/Store - delite/StoreMap) to allow a store-based widget
-				// to delegate the store-related functions to a parent widget (delite#323).
-				if (!this.list.attached) {
-					this.list.attachedCallback();
-				}
+			// TODO
+			// This is a workaround waiting for a proper mechanism (at the level
+			// of delite/Store - delite/StoreMap) to allow a store-based widget
+			// to delegate the store-related functions to a parent widget (delite#323).
+			if (!this.list.attached) {
+				this.list.attachedCallback();
+			}
+
+			// Class added on the list such that Combobox' theme can have a specific
+			// CSS selector for elements inside the List when used as dropdown in
+			// the combo.
+			$(this.list).addClass("d-combobox-list");
 
-				// Class added on the list such that Combobox' theme can have a specific
-				// CSS selector for elements inside the List when used as dropdown in
-				// the combo.
-				$(this.list).addClass("d-combobox-list");
+			// The drop-down is hidden initially
+			$(this.list).addClass("d-hidden");
 
-				// The drop-down is hidden initially
-				$(this.list).addClass("d-hidden");
+			// The role=listbox is required for the list part of a combobox by the
+			// aria spec of role=combobox
+			this.list.type = "listbox";
 
-				// The role=listbox is required for the list part of a combobox by the
-				// aria spec of role=combobox
-				this.list.type = "listbox";
+			this.list.selectionMode = this.selectionMode === "single" ?
+				"radio" : "multiple";
 
-				this.list.selectionMode = this.selectionMode === "single" ?
-					"radio" : "multiple";
+			this._initHandlers();
 
-				this._initHandlers();
+			if (this._processValueAfterListInit) {
+				this.notifyCurrentValue("value");
+				delete this._processValueAfterListInit;
 			}
 		},
 
@@ -517,6 +516,8 @@ define([
 								}
 							}.bind(this), 100); // worth exposing a property for the delay?
 						}
+					} else {
+						this.focusNode.focus(); // put the focus back to the inputNode.
 					}
 				}.bind(this)),
 
@@ -526,6 +527,14 @@ define([
 					this.handleOnInput(this.value); // emit "input" event
 				}.bind(this)),
 
+				this.list.observe(function (oldValues) {
+					if ("renderItems" in oldValues) {
+						// if the source changes, we may have to update the
+						// inputNode's readOnly attribute
+						this._updateInputReadOnly = true;
+					}
+				}.bind(this)),
+
 				this.list.on("query-success", this._setSelectedItems.bind(this))
 			];
 		},
@@ -572,19 +581,16 @@ define([
 		 * on the channel has() features set by `deliteful/features`.
 		 * @private
 		 */
-		_useCenteredDropDown: function () {
-			return !!ComboPopup;
-		},
+		// _useCenteredDropDown: function () {
+		// 	return !!ComboPopup;
+		// },
 
 		loadDropDown: function () {
-			this._updateInputReadOnly();
-
-			var centeredDropDown = this._useCenteredDropDown();
-			var dropDown = centeredDropDown ?
+			var dropDown = this._isMobile ?
 				this.createCenteredDropDown() :
 				this.createAboveBelowDropDown();
 
-			this.dropDownPosition = centeredDropDown ?
+			this.dropDownPosition = this._isMobile ?
 				["center"] :
 				["below", "above"]; // this is the default
 
@@ -634,12 +640,13 @@ define([
 		 * @return {boolean}
 		 */
 		shouldRunQuery: function (inputElement) {
-			var mobile = this._useCenteredDropDown();
 			if (inputElement.value.length !== 0) {
 				// inputNode contains text
 				if (inputElement.value.length < this.minFilterChars) {
-					if (!mobile) {
+					if (!this._isMobile) {
 						this.closeDropDown();
+					} else {
+						this._toggleComboPopupList();
 					}
 					return false;
 				}
@@ -647,8 +654,11 @@ define([
 				// inputNode does not contain text
 				if (!this.hasDownArrow) {
 					// in auto complete mode
-					this.closeDropDown();
-					this._toggleComboPopupList();
+					if (this._isMobile) {
+						this._toggleComboPopupList();
+					} else {
+						this.closeDropDown();
+					}
 					return false;
 				}
 			}
@@ -659,8 +669,10 @@ define([
 		 * Toggles the list's visibility when ComboPopup is used (so in mobile)
 		 */
 		_toggleComboPopupList: function () {
-			if (this._useCenteredDropDown()) {
-				this.list.setAttribute("d-shown", "" + this.inputNode.value.length >= this.minFilterChars);
+			if (this._isMobile) {
+				this.list.setAttribute("d-shown",
+					"" + (this.dropDown.inputNode.value.length !== 0 &&
+					this.dropDown.inputNode.value.length >= this.minFilterChars));
 				this.list.emit("delite-size-change");
 			}
 		},
@@ -683,8 +695,8 @@ define([
 
 				// save what user typed at each keystroke.
 				this.value = inputElement.value;
-				if (this._useCenteredDropDown()) {
-					this.inputNode.value = inputElement.value;
+				if (this._isMobile) {
+					this.displayedValue = inputElement.value;
 				}
 				this.handleOnInput(this.value); // emit "input" event.
 
@@ -724,7 +736,7 @@ define([
 					if (this.opened) {
 						this.closeDropDown(true/*refocus*/);
 					}
-				} else if (evt.key === "Spacebar") {
+				} else if (evt.key === "Spacebar" && this.opened) {
 					// Simply forwarding the key event to List doesn't allow toggling
 					// the selection, because List's mechanism is based on the event target
 					// which here is the input element outside the List. TODO: see deliteful #500.
@@ -741,7 +753,7 @@ define([
 				} else if (evt.key === "ArrowDown" || evt.key === "ArrowUp" ||
 					evt.key === "PageDown" || evt.key === "PageUp" ||
 					evt.key === "Home" || evt.key === "End") {
-					if (this._useCenteredDropDown()) {
+					if (this._isMobile) {
 						this.list.emit("keydown", evt);
 					}
 					evt.stopPropagation();
@@ -750,28 +762,30 @@ define([
 			}.bind(this), inputElement);
 		},
 
-		_validateInput: function (userInteraction, init) {
+		_validateInput: function (userInteraction) {
 			if (this.selectionMode === "single") {
-				this._validateSingle(userInteraction, init);
+				this._validateSingle(userInteraction);
 			} else {
-				this._validateMultiple(userInteraction, init);
+				this._validateMultiple(userInteraction);
 			}
 			this._justValidated = true;
+			this.notifyCurrentValue("_justValidated");
 		},
 
-		_validateSingle: function (userInteraction, init) {
+		_validateSingle: function (userInteraction) {
 			if (userInteraction) {
 				var selectedItem = this.list.selectedItem;
 				// selectedItem non-null because List in radio selection mode, but
 				// the List can be empty, so:
-				this.inputNode.value = selectedItem ? this._getItemLabel(selectedItem) : "";
+				this.displayedValue = selectedItem ? this._getItemLabel(selectedItem) : "";
 				this.value = selectedItem ? this._getItemValue(selectedItem) : "";
-			} else if (init) {
-				this.inputNode.value = this.displayedValue !== "" ? this.displayedValue : this.value;
+			} else {
+				var item = this.hasDownArrow ? this._retrieveItemFromSource(this.value) : null;
+				this.displayedValue = item ? item[this.list.labelAttr || this.list.labelFunc] : this.value;
 			}
 		},
 
-		_validateMultiple: function (userInteraction, init) {
+		_validateMultiple: function (userInteraction) {
 			var n;
 			if (userInteraction) {
 				var selectedItems = this.list.selectedItems;
@@ -795,7 +809,7 @@ define([
 				// make sure this is already done when FormValueWidget.handleOnInput() runs.
 				this.valueNode.value = value;
 				this.handleOnInput(this.value); // emit "input" event
-			} else if (init) {
+			} else {
 				var items = [];
 				if (typeof this.value === "string") {
 					if (this.value.length > 0) {
@@ -809,11 +823,12 @@ define([
 				} // else empty array. No pre-set values.
 				n = items.length;
 				if (n > 1) {
-					this.inputNode.value = string.substitute(this.multipleChoiceMsg, {items: n});
+					this.displayedValue = string.substitute(this.multipleChoiceMsg, {items: n});
 				} else if (n === 1) {
-					this.inputNode.value = this.displayedValue !== "" ? this.displayedValue : items[0];
+					var item = this.hasDownArrow ? this._retrieveItemFromSource(items[0]) : null;
+					this.displayedValue = item ? item[this.list.labelAttr || this.list.labelFunc] : this.value;
 				} else {
-					this.inputNode.value = this.multipleChoiceNoSelectionMsg;
+					this.displayedValue = this.multipleChoiceNoSelectionMsg;
 				}
 			}
 		},
@@ -848,6 +863,21 @@ define([
 			this.openDropDown();
 		},
 
+		_retrieveItemFromSource: function (key) {
+			var item = null,
+				_source = this.source || (this.list && this.list.source);
+			if (_source) {
+				if (Array.isArray(_source)) {
+					item = _source.filter(function (i) {
+						return i[this.list.valueAttr || this.list.labelAttr] === key;
+					}.bind(this))[0];
+				} else {
+					item = _source.getSync && _source.getSync(key);
+				}
+			}
+			return item;
+		},
+
 		/**
 		 * Sets the new list's query.
 		 * This method can be overridden when using other store types.
@@ -901,12 +931,10 @@ define([
 				this._setSelectedItems();
 
 				if (!this.opened) {
-					var mobile = this._useCenteredDropDown();
-
 					// On desktop, leave focus in the original <input>.  But on mobile, focus the popup dialog.
-					this.focusOnPointerOpen = this.focusOnKeyboardOpen = mobile;
+					this.focusOnPointerOpen = this.focusOnKeyboardOpen = this._isMobile;
 
-					if (!mobile) {
+					if (!this._isMobile) {
 						this.defer(function () {
 							// Avoid losing focus when clicking the arrow (instead of the input element):
 							// TODO: isn't this already handled by delite/HasDropDown#_dropDownPointerUpHandler() ?
@@ -921,17 +949,25 @@ define([
 					// Avoid that List gives focus to list items when navigating, which would
 					// blur the input field used for entering the filtering criteria.
 					this.dropDown.focusDescendants = false;
-					if (!this._useCenteredDropDown()) {
+					if (!this._isMobile) {
 						// desktop version
 						this._updateScroll(undefined, true);	// sets this.list.navigatedDescendant
 						this._setActiveDescendant(this.list.navigatedDescendant);
 					} else {
 						// mobile version
+						// INFO: display into the popup's inputNode any pre-selected item or typed text,
+						// only if the inputNode is visible, though.
+						if (!this._inputReadOnly) {
+							this.dropDown.inputNode.value = this.displayedValue;
+						}
+
 						if (!this.hasDownArrow) {
 							this._toggleComboPopupList();
 						}
+
 						this.dropDown.focus();
 					}
+
 				}.bind(this));
 			};
 		}),
@@ -960,8 +996,10 @@ define([
 		_dropDownKeyUpHandler: dcl.superCall(function (sup) {
 			return function () {
 				if (this.hasDownArrow) {
-					if (this.inputNode.value.length === 0 && this.minFilterChars === 0) {
-						this.list.query = this._getDefaultQuery();
+					if (this.inputNode.value.length === 0) {
+						if (this.minFilterChars === 0) {
+							this.list.query = this._getDefaultQuery();
+						}
 					} else if (this.inputNode.value.length < this.minFilterChars) {
 						return;
 					}
@@ -979,6 +1017,9 @@ define([
 			// Since List is in focus-less mode, it does not give focus to
 			// navigated items, thus the browser does not autoscroll.
 			// TODO: see deliteful #498
+			if (!item) {
+				item = this.list.navigatedDescendant;
+			}
 
 			if (!item) {
 				var selectedItems = this.list.selectedItems;
@@ -1010,6 +1051,18 @@ define([
 				var input = this._popupInput || this.inputNode;
 				input.setAttribute("aria-activedescendant", nd.id);
 			}
+		},
+
+		_isSourceEmpty: function () {
+			var _source = (this.list && this.list.source) || this.source;
+			if (_source) {
+				if (Array.isArray(_source)) {
+					return _source.length === 0;
+				}
+				// not an array.
+				return _source.data && _source.data.length === 0;
+			}
+			return true;
 		}
 	});
 });
diff --git a/Combobox/ComboPopup.html b/Combobox/ComboPopup.html
index 7e9a66a9a7..3a2913d665 100644
--- a/Combobox/ComboPopup.html
+++ b/Combobox/ComboPopup.html
@@ -1,8 +1,9 @@
 <template role="presentation"
 	requires="deliteful/LinearLayout, deliteful/Button">
 	<d-linear-layout style="height: 100%">
-        <div class="d-combo-popup-header">{{header}}</div>
-		<input d-hidden="{{!(this.combobox.autoFilter && this.combobox.selectionMode !== 'multiple')}}"
+        <div class="d-combo-popup-header" id="{{_tag}}-{{widgetId}}-header">{{header}}</div>
+		<input d-hidden="{{this.combobox._inputReadOnly}}"
+			aria-labelledby="{{_tag}}-{{widgetId}}-header"
 			attach-point="inputNode"
 			class="d-combobox-input"
 			role="combobox" autocomplete="off" autocapitalize="none" autocorrect="off"
@@ -17,4 +18,4 @@
 				label="{{combobox.okMsg}}" on-click="{{okHandler}}"></button>
 		</d-linear-layout>
 	</d-linear-layout>
-</template>
+</template>
\ No newline at end of file
diff --git a/Combobox/ComboPopup.js b/Combobox/ComboPopup.js
index 332c1b759a..97339da9c9 100644
--- a/Combobox/ComboPopup.js
+++ b/Combobox/ComboPopup.js
@@ -58,6 +58,11 @@ define([
 							.removeClass("d-hidden");
 					}
 					this.combobox._prepareInput(this.inputNode);
+					this.combobox.observe(function (oldValues) {
+						if ("opened" in oldValues) {
+							this.inputNode.setAttribute("aria-expanded", this.combobox.opened);
+						}
+					}.bind(this));
 				}
 			}
 		},
@@ -67,7 +72,7 @@ define([
 		 * @protected
 		 */
 		okHandler: function () {
-			this.combobox._validateMultiple(this.combobox.inputNode);
+			// NOTE: no need to validate since it's handled by the `selection-change` listener
 			this.combobox.closeDropDown();
 		},
 
@@ -76,7 +81,11 @@ define([
 		 * @protected
 		 */
 		cancelHandler: function () {
+			// INFO: resetting any selected items.
+			this.combobox.list.selectedItems = [];
 			this.combobox.closeDropDown();
+			// cont: then ask to validate, so widget's value and inputNode get updated as well.
+			this.combobox._validateMultiple(true);
 		},
 
 		/**
@@ -84,7 +93,7 @@ define([
 		 * @protected
 		 */
 		focus: function () {
-			if (this.combobox.autoFilter && this.combobox.selectionMode === "single") {
+			if (!this.combobox._inputReadOnly) {
 				this.inputNode.focus();
 			} else {
 				// first check if list is not hidden.
@@ -93,7 +102,7 @@ define([
 					var id = this.combobox.list.getIdentity(
 						this.combobox.list.selectedItems.length > 0 ? this.combobox.list.selectedItems[0] : "");
 					var renderer = (id && id !== -1) ? this.combobox.list.getRendererByItemId(id) :
-						this.combobox.list.getRenderers()[0];
+						this.combobox.list.getItemRenderers()[0];
 					this.combobox.list.navigateTo(renderer);
 				}
 			}
diff --git a/Combobox/Combobox.html b/Combobox/Combobox.html
index 4cb1b0d6f0..325b3899de 100644
--- a/Combobox/Combobox.html
+++ b/Combobox/Combobox.html
@@ -4,11 +4,13 @@
 		attach-point="inputNode,focusNode"
 		autocomplete="off" autocorrect="off" autocapitalize="none"
 		aria-autocomplete="list"
+		aria-expanded="{{opened}}"
 		type="text"
-		readonly="{{this._inputReadOnly ? 'readonly' : ''}}">
+		value="{{displayedValue}}"
+		placeholder="{{searchPlaceHolder}}">
 	<input class="d-hidden"
 		attach-point="valueNode"
-		readonly name="{{name}}" value="{{value}}">
+		readonly name="{{name}}">
 	<span class="d-combobox-arrow" d-shown="{{hasDownArrow}}"
 		attach-point="buttonNode" aria-hidden="true"></span>
 </template>
diff --git a/samples/Combobox.html b/samples/Combobox.html
index 6c68fec65f..6090e4e5bb 100644
--- a/samples/Combobox.html
+++ b/samples/Combobox.html
@@ -13,13 +13,15 @@
 
 	<script type="text/javascript">
 		require.config({
-			baseUrl: "../.."
+			baseUrl: "../..",
+			waitSeconds: 60 // for debugging...
 		});
 	</script>
 
 	<script type="text/javascript">
 		require([
 			"requirejs-dplugins/jquery!event",
+			"dstore/Memory",
 			"deliteful/list/List",
 			"deliteful/tests/functional/SlowStore",
 			"deliteful/Combobox",
@@ -28,7 +30,7 @@
 			"deliteful/Checkbox",
 			"delite/theme!delite/themes/{{theme}}/global.css",	// page level CSS
 			"requirejs-domready/domReady!"
-		], function ($, List, SlowStore, Combobox) {
+		], function ($, Memory, List, SlowStore, Combobox) {
 
 			startsWith.on("change", function () {
 				comboTeams.filterMode = "startsWith";
@@ -94,6 +96,17 @@
 			};
 			container.appendChild(comboTeamsAutoComplete);
 
+			var comboEmptyStore = new Combobox({
+				id: "comboEmptyStore",
+				selectionMode: "single",
+				autoFilter: true,
+				hasDownArrow: true,
+				list: new List({showNoItems: true}),
+				source: new Memory()
+			});
+
+			document.getElementById("comboEmptyStoreContainer").appendChild(comboEmptyStore);
+
 			document.body.style.display = "";
 		});
 	</script>
@@ -111,7 +124,7 @@
 	<br/><br/>
 	<p>
 		<label for="comboTeams-input">Your favorite team (single choice):</label><br/>
-		<span>[options: default; displayedValue:"Italy" (value: Italy)]</span>
+		<span>[options: default; value: Italy]</span>
 	</p>
 	<d-combobox selectionMode="single" autoFilter="true" id="comboTeams" value="Italy">
 		<d-list righttextAttr="world-cup-victories" categoryAttr="region" showNoItems="true">
@@ -170,7 +183,7 @@
 
 	<p>
 	<label for="comboTeams3-input">Your favorite team (single choice):</label><br/>
-	<span>[options: hasDownArrow=false, filterDelay=750ms, minFilterChars=0]</span>
+	<span>[options: hasDownArrow=true, filterDelay=750ms, minFilterChars=0]</span>
 	</p>
 	<d-combobox selectionMode="single" autoFilter="true" id="comboTeams3" hasDownArrow="true" filterDelay="750" minFilterChars="0">
 		<d-list righttextAttr="world-cup-victories" categoryAttr="region" showNoItems="true">
@@ -219,7 +232,7 @@
 	</d-combobox>
 
 	<p>
-	<label for="comboPlayersWithValuesDecl-input">Your favorite players (multiple choice - declaratively ):</label>
+	<label for="comboPlayersWithValuesDecl-input">Your favorite players (multiple choice - declaratively):</label>
 	<br/>Pre-set values = Hagi, Buffon
 	</p>
 	<d-combobox selectionMode="multiple" id="comboPlayersWithValuesDecl" value="Hagi,Buffon">
@@ -232,6 +245,11 @@
 		</d-list>
 	</d-combobox>
 
+	<p>
+	<label for="comboEmptyStoreContainer-input">Combobox with an empty store</label>
+	<br/>
+	<div id="comboEmptyStoreContainer"></div>
+
 	<p>
 	<button is="d-button" onclick="showResults()">Done</button>
 	</p>
@@ -242,6 +260,7 @@ <h4>The below is using a `slowStore`, that mimics a `dStore/Request`</h4>
 	<span>[hasDropDown:false, source: SlowStore, filterDelay:500ms]</span>
 	</p>
 	<div id="comboTeamsAutoCompleteContainer"></div>
+
 	<br/>
 </body>
 </html>
diff --git a/tests/functional/ComboPopup.html b/tests/functional/ComboPopup.html
index 8a2cf9b220..96ce01b268 100644
--- a/tests/functional/ComboPopup.html
+++ b/tests/functional/ComboPopup.html
@@ -16,6 +16,7 @@
 	<script type="text/javascript">
 		// global variables used by the automatic functional tests test:
 		var ready = false; // set to true when the test page is ready
+		var storeTestingInfo;
 
 		require.config({
 			config: {
@@ -37,7 +38,7 @@
 			register.deliver();
 
 			// Store information for use in the automatic functional test
-			var storeTestingInfo = function (combo) {
+			storeTestingInfo = function (combo) {
 				if (!combo.init) {
 					combo._inputEventCounter = 0;
 					combo._changeEventCounter = 0;
@@ -67,17 +68,20 @@
 			};
 
 			// single selection mode, autoFilter=true
-			combo = document.getElementById("combo1");
 			storeTestingInfo(document.getElementById("combo1"));
 
 			// single selection mode, autoFilter=true
-			combo = document.getElementById("combo2");
 			storeTestingInfo(document.getElementById("combo2"));
 
 			// multiple selection mode
-			combo = document.getElementById("combo3");
 			storeTestingInfo(document.getElementById("combo3"));
 
+			// auto complete mode, min filter char = 3
+			storeTestingInfo(document.getElementById("combo4"));
+
+			// auto complete mode, min filter char = 0
+			storeTestingInfo(document.getElementById("combo5"));
+
 			// Used by the automatic functional test, for comboboxes in both
 			// single and multiple selection modes.
 			getComboState = function (comboId) {
@@ -95,6 +99,7 @@
 						combo.inputNode.getAttribute("aria-activedescendant"));
 				return {
 					inputNodeValue: combo.inputNode.value,
+					popupInputNodeValue: combo.opened ? combo.dropDown.inputNode.value : "",
 					widgetValue: combo.value,
 					valueNodeValue: combo.valueNode.value,
 					opened: combo.opened,
@@ -142,7 +147,7 @@ <h1>
 	</h1>
 
 	<label for="combo1-input">
-		Simple Combobox popup
+		id = combo1 - Simple Combobox popup
 	</label>
 	<d-combobox selectionMode="single" autoFilter="false" id="combo1" name="combo1" value="France">
 		<d-list righttextAttr="sales" categoryAttr="region">
@@ -187,7 +192,7 @@ <h1>
 	</d-combobox>
 
 	<label for="combo2-input">
-		Combobox popup with &lt;input&gt; (autoFilter=true)
+		id = combo2 - Combobox popup with &lt;input&gt; (autoFilter=true)
 	</label>
 	<d-combobox selectionMode="single" autoFilter="true" id="combo2" name="combo2" value="France">
 		<d-list righttextAttr="sales" categoryAttr="region" showNoItems="true">
@@ -232,7 +237,7 @@ <h1>
 	</d-combobox>
 
 	<label for="combo3-input">
-		Combobox with OK/cancel button (multiselect)
+		id = combo3 - Combobox with OK/cancel button (multiselect)
 	</label>
 	<d-combobox selectionMode="multiple" autoFilter="false" id="combo3" name="combo3">
 		<d-list righttextAttr="sales" categoryAttr="region">
@@ -277,7 +282,7 @@ <h1>
 	</d-combobox>
 
 	<label for="combo4-input">
-		Combobox popup with &lt;input&gt; autoFilter=true, hasDownArrow=false, minFilterChars=3, "AutoComplete" mode
+		id = combo4 - Combobox popup with &lt;input&gt; autoFilter=true, hasDownArrow=false, minFilterChars=3, "AutoComplete" mode
 	</label>
 	<d-combobox selectionMode="single" autoFilter="true" hasDownArrow="false" id="combo4" name="combo4" minFilterChars="3">
 		<d-list righttextAttr="sales" categoryAttr="region" showNoItems="true">
@@ -322,7 +327,7 @@ <h1>
 	</d-combobox>
 
 	<label for="combo5-input">
-		Combobox popup with &lt;input&gt; (autoFilter=true), hasDownArrow=false, minFilterChars=0, "AutoComplete" mode
+		id = combo5 - Combobox popup with &lt;input&gt; (autoFilter=true), hasDownArrow=false, minFilterChars=0, "AutoComplete" mode
 	</label>
 	<d-combobox selectionMode="single" autoFilter="true" hasDownArrow="false" id="combo5" name="combo5" minFilterChars="0">
 		<d-list righttextAttr="sales" categoryAttr="region" showNoItems="true">
diff --git a/tests/functional/ComboPopup.js b/tests/functional/ComboPopup.js
index 0310bf3ff3..04c89fd1c7 100644
--- a/tests/functional/ComboPopup.js
+++ b/tests/functional/ComboPopup.js
@@ -36,6 +36,11 @@ define([
 		assert.strictEqual(comboState.inputNodeValue, expectedComboState.inputNodeValue,
 			selectionMode + " combo.inputNode.value " + stepName + " " +
 			comboId + ".inputNode.value");
+
+		assert.strictEqual(comboState.popupInputNodeValue, expectedComboState.popupInputNodeValue,
+			selectionMode + " combo.popupInputNodeValue.value " + stepName + " " +
+			comboId + ".popupInputNodeValue.value");
+
 		assertEqualValue(comboState.widgetValue, expectedComboState.widgetValue,
 				selectionMode + " combo.value " + stepName + " " +
 				comboId + ".value");
@@ -81,6 +86,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "France",
+						popupInputNodeValue: "",
 						widgetValue: "France",
 						valueNodeValue: "France",
 						opened: false,
@@ -103,6 +109,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "France",
+						popupInputNodeValue: "France",
 						widgetValue: "France",
 						valueNodeValue: "France",
 						opened: true,
@@ -117,6 +124,18 @@ define([
 					}, "after click on root node");
 			})
 			.findByCssSelector(".d-combo-popup .d-linear-layout .d-combobox-input[d-hidden='false']")
+			.pressKeys(keys.BACKSPACE) // Delete the 6 chars of "France"
+			.sleep(100)
+			.pressKeys(keys.BACKSPACE)
+			.sleep(100)
+			.pressKeys(keys.BACKSPACE)
+			.sleep(100)
+			.pressKeys(keys.BACKSPACE)
+			.sleep(100)
+			.pressKeys(keys.BACKSPACE)
+			.sleep(100)
+			.pressKeys(keys.BACKSPACE)
+			.sleep(100)
 			.type("j")
 			.type("a")
 			.type("p")
@@ -127,12 +146,13 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "jap",
+						popupInputNodeValue: "jap",
 						widgetValue: "jap",
 						valueNodeValue: "jap",
 						opened: true,
 						selectedItemsCount: 0,
 						itemRenderersCount: 30,
-						inputEventCounter: 3, // typed "jap"
+						inputEventCounter: 9, // removed "france" and typed "jap"
 						changeEventCounter: 0,
 						widgetValueAtLatestInputEvent: "jap",
 						valueNodeValueAtLatestInputEvent: "jap",
@@ -152,6 +172,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "",
+						popupInputNodeValue: "",
 						widgetValue: "",
 						valueNodeValue: "",
 						opened: true,
@@ -173,6 +194,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "u",
+						popupInputNodeValue: "u",
 						widgetValue: "u",
 						valueNodeValue: "u",
 						opened: true,
@@ -221,7 +243,7 @@ define([
 			.end();
 	};
 
-	var checkSingleSelection = function (remote, comboId) {
+	var checkSingleSelection = function (remote, comboId, autoFilter) {
 		var executeExpr = "return getComboState(\"" + comboId + "\");";
 		return loadFile(remote, "./ComboPopup.html")
 			.findById(comboId)
@@ -232,6 +254,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "France",
+						popupInputNodeValue: "", // popup closed
 						widgetValue: "France",
 						valueNodeValue: "France",
 						opened: false,
@@ -254,6 +277,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "France",
+						popupInputNodeValue: autoFilter ? "France" : "",
 						widgetValue: "France",
 						valueNodeValue: "France",
 						opened: true,
@@ -277,6 +301,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "Germany",
+						popupInputNodeValue: "", // popup closed
 						widgetValue: "Germany",
 						valueNodeValue: "Germany",
 						opened: false,
@@ -304,6 +329,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: comboState.multipleChoiceNoSelectionMsg,
+						popupInputNodeValue: "", // invisible!
 						widgetValue: [],
 						valueNodeValue: "",
 						opened: false,
@@ -326,6 +352,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: comboState.multipleChoiceNoSelectionMsg,
+						popupInputNodeValue: "", // invisible
 						widgetValue: [],
 						valueNodeValue: "",
 						opened: true,
@@ -348,6 +375,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: "Germany",
+						popupInputNodeValue: "", // invisible
 						widgetValue: ["Germany"],
 						valueNodeValue: "Germany",
 						opened: true,
@@ -370,6 +398,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: string.substitute(comboState.multipleChoiceMsg, {items: 2}),
+						popupInputNodeValue: "", // invisible
 						widgetValue: ["China", "Germany"],
 						valueNodeValue: "China,Germany",
 						opened: true,
@@ -392,6 +421,7 @@ define([
 				checkComboState(comboId, comboState,
 					{ // expected combo state
 						inputNodeValue: string.substitute(comboState.multipleChoiceMsg, {items: 2}),
+						popupInputNodeValue: "", // invisible
 						widgetValue: ["China", "Germany"],
 						valueNodeValue: "China,Germany",
 						opened: false,
@@ -403,7 +433,127 @@ define([
 						valueNodeValueAtLatestInputEvent: "China,Germany",
 						widgetValueAtLatestChangeEvent: ["China", "Germany"],
 						valueNodeValueAtLatestChangeEvent: "China,Germany"
-					}, "after clicking again the root node (close)");
+					}, "after clicking on the 'Ok' button (close)");
+			})
+			.end();
+	};
+
+	var checkMultiSelectionCancel = function (remote, comboId) {
+		var executeExpr = "return getComboState(\"" + comboId + "\");";
+		return loadFile(remote, "./ComboPopup.html")
+			.findById(comboId)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				// The first option should be the one selected,
+				// the popup is closed initially
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: comboState.multipleChoiceNoSelectionMsg,
+						popupInputNodeValue: "", // invisible!
+						widgetValue: [],
+						valueNodeValue: "",
+						opened: false,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 0, // no event so far
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: undefined, // never received
+						valueNodeValueAtLatestInputEvent: undefined,
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "right after load");
+			})
+			.click()
+			.sleep(500) // wait for List's loading panel to go away
+			.execute(executeExpr)
+			.then(function (comboState) {
+				// The first option should be the one selected,
+				// the first click just opens the dropdown.
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: comboState.multipleChoiceNoSelectionMsg,
+						popupInputNodeValue: "", // invisible
+						widgetValue: [],
+						valueNodeValue: "",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 0, // no event so far
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: undefined, // never received
+						valueNodeValueAtLatestInputEvent: undefined,
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after click on root node");
+			})
+			.end()
+			.findById(comboId + "_item1") // "Germany"
+			.click()
+			.sleep(500) // wait for popup to close
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "Germany",
+						popupInputNodeValue: "", // invisible
+						widgetValue: ["Germany"],
+						valueNodeValue: "Germany",
+						opened: true,
+						selectedItemsCount: 1,
+						itemRenderersCount: 37,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: ["Germany"],
+						valueNodeValueAtLatestInputEvent: "Germany",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after clicking option (Germany))");
+			})
+			.end()
+			.findById(comboId + "_item6") // "China"
+			.click()
+			.sleep(500) // wait for popup to close
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: string.substitute(comboState.multipleChoiceMsg, {items: 2}),
+						popupInputNodeValue: "", // invisible
+						widgetValue: ["China", "Germany"],
+						valueNodeValue: "China,Germany",
+						opened: true,
+						selectedItemsCount: 2,
+						itemRenderersCount: 37,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: ["China", "Germany"],
+						valueNodeValueAtLatestInputEvent: "China,Germany",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after clicking option (China))");
+			})
+			.end()
+			.findByCssSelector(".d-combo-cancel-button")
+			.click()
+			.sleep(500) // wait for the async closing of the popup
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: comboState.multipleChoiceNoSelectionMsg,
+						popupInputNodeValue: "", // invisible
+						widgetValue: [],
+						valueNodeValue: "",
+						opened: false,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 1,
+						changeEventCounter: 1, // incremented
+						widgetValueAtLatestInputEvent: [],
+						valueNodeValueAtLatestInputEvent: "",
+						widgetValueAtLatestChangeEvent: [],
+						valueNodeValueAtLatestChangeEvent: ""
+					}, "after clicking on the 'Cancel' button (close)");
 			})
 			.end();
 	};
@@ -462,6 +612,390 @@ define([
 			});
 	};
 
+	var checkAutoCompleteFilteringWithThreeFilterChars = function (remote, comboId) {
+		var executeExpr = "return getComboState(\"" + comboId + "\");";
+		return loadFile(remote, "./ComboPopup.html")
+			.findById(comboId)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						popupInputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: false,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 0,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: undefined, // never received
+						valueNodeValueAtLatestInputEvent: undefined,
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "right after load");
+			})
+			.click()
+			.sleep(250)
+			.end()
+			.execute(executeExpr) // when the popup opens, focus goes into the inputNode.
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						popupInputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 0,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: undefined, // never received
+						valueNodeValueAtLatestInputEvent: undefined,
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after click on root node");
+			})
+			.findByCssSelector("#" + comboId + "_dropdown")
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys("j")
+			.sleep(100)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "j",
+						popupInputNodeValue: "j",
+						widgetValue: "j",
+						valueNodeValue: "j",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "j",
+						valueNodeValueAtLatestInputEvent: "j",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `j` - no query run yet.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='false']") // list not visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be invisible at this stage.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys("a")
+			.sleep(100)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "ja",
+						popupInputNodeValue: "ja",
+						widgetValue: "ja",
+						valueNodeValue: "ja",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "ja",
+						valueNodeValueAtLatestInputEvent: "ja",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `a` (ja) - no query run yet.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='false']") // list not visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be invisible at this stage.");
+			})
+			.end()
+			.pressKeys("p")
+			.sleep(100)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "jap",
+						popupInputNodeValue: "jap",
+						widgetValue: "jap",
+						valueNodeValue: "jap",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 30, // showing only `jap` matching items.
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "jap",
+						valueNodeValueAtLatestInputEvent: "jap",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `jap` - query did run.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='true']") // list visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be visible at this stage.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys(keys.BACKSPACE) // removing one chars, list must disappear.
+			.sleep(100)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "ja",
+						popupInputNodeValue: "ja",
+						widgetValue: "ja",
+						valueNodeValue: "ja",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 30, // showing only `jap` matching items.
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "ja",
+						valueNodeValueAtLatestInputEvent: "ja",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after deleting `p` from `jap` - query did not run.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='false']") // list not visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be visible at this stage.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys(keys.BACKSPACE) // removing remaing two chars, list must disappear.
+			.pressKeys(keys.BACKSPACE)
+			.sleep(100)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						popupInputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 30, // showing only `jap` matching items.
+						inputEventCounter: 2,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "",
+						valueNodeValueAtLatestInputEvent: "",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after deleting `ja` from the inputNode - query did not run.");
+			})
+			.isDisplayed() // check if popup is still visible.
+			.then(function (isVisible) {
+				assert.isTrue(isVisible, "popup must be visible at this stage.");
+			})
+			.end();
+	};
+
+	var checkAutoCompleteFilteringWithZeroFilterChars = function (remote, comboId) {
+		var executeExpr = "return getComboState(\"" + comboId + "\");";
+		return loadFile(remote, "./ComboPopup.html")
+			.findById(comboId)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						popupInputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: false,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 0,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: undefined, // never received
+						valueNodeValueAtLatestInputEvent: undefined,
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "right after load");
+			})
+			.click()
+			.sleep(250)
+			.end()
+			.execute(executeExpr) // when the popup opens, focus goes into the inputNode.
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						popupInputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 37,
+						inputEventCounter: 0,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: undefined, // never received
+						valueNodeValueAtLatestInputEvent: undefined,
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after click on root node");
+			})
+			.findByCssSelector("#" + comboId + "_dropdown")
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys("j")
+			.sleep(250)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "j",
+						popupInputNodeValue: "j",
+						widgetValue: "j",
+						valueNodeValue: "j",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 30,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "j",
+						valueNodeValueAtLatestInputEvent: "j",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `j` - query did run.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='true']") // list visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be invisible at this stage.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys("a")
+			.sleep(250)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "ja",
+						popupInputNodeValue: "ja",
+						widgetValue: "ja",
+						valueNodeValue: "ja",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 30,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "ja",
+						valueNodeValueAtLatestInputEvent: "ja",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `a` (ja) - no query run yet.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='true']") // list visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be visible at this stage.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys(keys.BACKSPACE) // removing two chars, list must disappear.
+			.pressKeys(keys.BACKSPACE)
+			.sleep(250)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				// Clicking the root node just opens the dropdown. No other state change.
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						popupInputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 30,
+						inputEventCounter: 2,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "",
+						valueNodeValueAtLatestInputEvent: "",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after deleting `ja` from the inputNode - query did not run.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='false']") // list not visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be not visible at this stage.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys("g") // 'Germany' item visibile, list must show.
+			.sleep(100)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				// Clicking the root node just opens the dropdown. No other state change.
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "g",
+						popupInputNodeValue: "g",
+						widgetValue: "g",
+						valueNodeValue: "g",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 1, // showing only `g` matching items.
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "g",
+						valueNodeValueAtLatestInputEvent: "g",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `g` from the inputNode - query did run.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='true']") // list visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be visible at this stage.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-input[d-hidden='false']") // inputNode
+			.pressKeys(keys.BACKSPACE) // removing two chars, list must disappear.
+			.sleep(250)
+			.execute(executeExpr)
+			.then(function (comboState) {
+				// Clicking the root node just opens the dropdown. No other state change.
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						popupInputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 1,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "",
+						valueNodeValueAtLatestInputEvent: "",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after deleting `g` from the inputNode - query did not run.");
+			})
+			.end()
+			.findByCssSelector(".d-linear-layout .d-combobox-list[d-shown='false']") // list not visible
+			.then(function (list) {
+				assert.isNotNull(list, "list should be not visible at this stage.");
+			})
+			.end()
+			.isDisplayed() // check if popup is still visible.
+			.then(function (isVisible) {
+				assert.isTrue(isVisible, "popup must be visible at this stage.");
+			})
+			.end();
+	};
+
 	registerSuite({
 		name: "ComboPopup - functional",
 
@@ -537,7 +1071,7 @@ define([
 				return this.skip("click() doesn't generate touchstart/touchend, so popup won't open");
 			}
 
-			return checkSingleSelection(remote, "combo1");
+			return checkSingleSelection(remote, "combo1", false);
 		},
 
 		"single selection (combo2)": function () {
@@ -552,10 +1086,10 @@ define([
 				return this.skip("click() doesn't generate touchstart/touchend, so popup won't open");
 			}
 
-			return checkSingleSelection(remote, "combo2");
+			return checkSingleSelection(remote, "combo2", true);
 		},
 
-		"multi selection selection (combo3)": function () {
+		"multi selection (combo3)": function () {
 			var remote = this.remote;
 
 			if (remote.environmentType.browserName === "internet explorer") {
@@ -570,6 +1104,21 @@ define([
 			return checkMultiSelection(remote, "combo3");
 		},
 
+		"multi selection cancel button (combo3)": function () {
+			var remote = this.remote;
+
+			if (remote.environmentType.browserName === "internet explorer") {
+				// https://github.com/theintern/leadfoot/issues/17
+				return this.skip("click() doesn't generate mousedown/mouseup, so popup won't open");
+			}
+			if (remote.environmentType.platformName === "iOS") {
+				// https://github.com/theintern/leadfoot/issues/61
+				return this.skip("click() doesn't generate touchstart/touchend, so popup won't open");
+			}
+
+			return checkMultiSelectionCancel(remote, "combo3");
+		},
+
 		"tab navigation (combo3)": function () {
 			var remote = this.remote;
 
@@ -616,6 +1165,38 @@ define([
 			}
 
 			return checkFocus(remote, "combo2", true);
+		},
+
+		"autocomplete filtering - minFilterChars = 3 (combo4)": function () {
+			var remote = this.remote;
+
+			if (remote.environmentType.browserName === "internet explorer") {
+				// https://github.com/theintern/leadfoot/issues/17
+				return this.skip("click() doesn't generate mousedown/mouseup, so popup won't open");
+			}
+			if (remote.environmentType.platformName === "iOS" || remote.environmentType.safari ||
+				remote.environmentType.browserName === "safari" || remote.environmentType.brokenSendKeys ||
+				!remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support - brokenSendKeys");
+			}
+
+			return checkAutoCompleteFilteringWithThreeFilterChars(remote, "combo4");
+		},
+
+		"autocomplete filtering - minFilterChars = 0 (combo5)": function () {
+			var remote = this.remote;
+
+			if (remote.environmentType.browserName === "internet explorer") {
+				// https://github.com/theintern/leadfoot/issues/17
+				return this.skip("click() doesn't generate mousedown/mouseup, so popup won't open");
+			}
+			if (remote.environmentType.platformName === "iOS" || remote.environmentType.safari ||
+				remote.environmentType.browserName === "safari" || remote.environmentType.brokenSendKeys ||
+				!remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support - brokenSendKeys");
+			}
+
+			return checkAutoCompleteFilteringWithZeroFilterChars(remote, "combo5");
 		}
 	});
 });
diff --git a/tests/functional/Combobox-decl.html b/tests/functional/Combobox-decl.html
index d699076d0d..20c4d87bf1 100644
--- a/tests/functional/Combobox-decl.html
+++ b/tests/functional/Combobox-decl.html
@@ -17,6 +17,7 @@
 		// global variables used by the automatic functional tests test:
 		var ready = false; // set to true when the test page is ready
 		var getComboState;
+		var storeTestingInfo;
 
 		require([
 			"delite/register",
@@ -61,7 +62,7 @@
 			combo.deliver();
 
 			// Store information for use in the automatic functional test
-			var storeTestingInfo = function (combo) {
+			storeTestingInfo = function (combo) {
 				if (!combo.init) {
 					combo._inputEventCounter = 0;
 					combo._changeEventCounter = 0;
@@ -91,23 +92,23 @@
 			};
 
 			// single selection mode, autoFilter=true
-			combo = document.getElementById("combo1");
 			storeTestingInfo(document.getElementById("combo1"));
 
 			// single selection mode, autoFilter=true
-			combo = document.getElementById("combo2");
 			storeTestingInfo(document.getElementById("combo2"));
 
 			// multiple selection mode
-			combo = document.getElementById("combo3");
 			storeTestingInfo(document.getElementById("combo3"));
 
-			combo = document.getElementById("combo-minfilterchars0");
+			// single selection mode, autofilter=true, minFilterChars = 0
 			storeTestingInfo(document.getElementById("combo-minfilterchars0"));
 
-			combo = document.getElementById("combo-minfilterchars3");
+			// single selection mode, autofilter=true, minFilterChars = 3
 			storeTestingInfo(document.getElementById("combo-minfilterchars3"));
 
+			// single selection mode, auto-complete mode (hasDownArrow = false)
+			storeTestingInfo(document.getElementById("combo-autocomplete"));
+
 			// Used by the automatic functional test, for comboboxes in both
 			// single and multiple selection modes.
 			getComboState = function (comboId) {
@@ -144,6 +145,12 @@
 				};
 			};
 
+			getNavigatedDescendant = function (comboId) {
+				var combo = document.getElementById(comboId);
+				return combo.list && combo.list.navigatedDescendant
+					&& combo.list.navigatedDescendant.textContent.trim();
+			};
+
 			isAligned = function (comboId, pos) {
 				var combo = document.getElementById(comboId);
 				var popup = document.getElementById(comboId +  "_dropdown_wrapper");
@@ -706,14 +713,23 @@ <h1>
 		</d-list>
 	</d-combobox>
 
-	<label for="combo-slowstore">
+	<label for="combo-slowstore-input">
 		id: "combo-slowstore", selectionMode: "single", autoFilter: true,
 	</label>
 	<d-combobox selectionMode="single" autoFilter="true"
 		id="combo-slowstore" name="combo-slowstore" filterDelay="100">
 	</d-combobox>
 
-	<label for="combo-minfilterchars0">
+	<label for="combo-empty-store-input">
+		id: "combo-empty-store", selectionMode: "single", autoFilter: true, hasDownArrow: false
+	</label>
+	<d-combobox selectionMode="single" hasDownArrow="true" autoFilter="true"
+		id="combo-empty-store" name="combo-empty-store">
+		<d-list righttextAttr="sales" categoryAttr="region" showNoItems="true">
+		</d-list>
+	</d-combobox>
+
+	<label for="combo-minfilterchars0-input">
 		id: "combo-minfilterchars0", selectionMode: "single", autoFilter: true, minFilterChars: 0
 	</label>
 	<d-combobox selectionMode="single" autoFilter="true" minFilterChars="0"
@@ -759,7 +775,7 @@ <h1>
 		</d-list>
 	</d-combobox>
 
-	<label for="combo-minfilterchars3">
+	<label for="combo-minfilterchars3-input">
 		id: "combo-minfilterchars3", selectionMode: "single", autoFilter: true, minFilterChars: 3
 	</label>
 	<d-combobox selectionMode="single" autoFilter="true" minFilterChars="3"
@@ -805,6 +821,51 @@ <h1>
 		</d-list>
 	</d-combobox>
 
+	<label for="combo-autocomplete-input">
+		id: "combo-autocomplete", hasDownArrow: false
+	</label>
+	<d-combobox hasDownArrow="false" id="combo-autocomplete" name="combo-autocomplete">
+		<d-list righttextAttr="sales" categoryAttr="region" showNoItems="true">
+			{ "label": "France", "sales": 500, "profit": 50, "region": "EU" },
+			{ "label": "Germany", "sales": 450, "profit": 48, "region": "EU" },
+			{ "label": "UK", "sales": 700, "profit": 60, "region": "EU" },
+			{ "label": "USA", "sales": 2000, "profit": 250, "region": "America" },
+			{ "label": "Canada", "sales": 600, "profit": 30, "region": "America" },
+			{ "label": "Brazil", "sales": 450, "profit": 30, "region": "America" },
+			{ "label": "China", "sales": 500, "profit": 40, "region": "Asia" },
+			{ "label": "Japan", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan2", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan3", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan4", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan5", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan6", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan7", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan8", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan9", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan10", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan11", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan12", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan13", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan14", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan15", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan16", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan17", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan18", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan19", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan20", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan21", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan22", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan23", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan24", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan25", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan26", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan27", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan28", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan29", "sales": 900, "profit": 100, "region": "Asia" },
+			{ "label": "Japan30", "sales": 900, "profit": 100, "region": "Asia" }
+		</d-list>
+	</d-combobox>
+
 	<br/><br/>
 	<input id="resetB" type="reset">
 	<input id="submitB" type="submit">
diff --git a/tests/functional/Combobox-prog.html b/tests/functional/Combobox-prog.html
index 6e51544f7a..0e21ac9cd3 100644
--- a/tests/functional/Combobox-prog.html
+++ b/tests/functional/Combobox-prog.html
@@ -38,7 +38,7 @@
 					{ label: "Japan", sales: 900, profit: 100, region: "Asia" }
 			]});
 			var dataSourceWithValue = new Memory(
-				{idProperty: "label",
+				{idProperty: "myValue",
 				data: [
 					{ label: "France", myValue: "FR", sales: 500, profit: 50, region: "EU" },
 					{ label: "Germany", myValue: "DE", sales: 450, profit: 48, region: "EU" },
diff --git a/tests/functional/Combobox.js b/tests/functional/Combobox.js
index dad0baeb38..71d631c83d 100644
--- a/tests/functional/Combobox.js
+++ b/tests/functional/Combobox.js
@@ -857,6 +857,151 @@ define([
 			.execute(comboId + ".closeDropDown();");
 	};
 
+	var checkNavigatedDescendantNoSelection = function (remote, comboId) {
+		var executeExpr = "return getNavigatedDescendant(\"" + comboId + "\");";
+		return loadFile(remote, "./Combobox-decl.html")
+			.execute(comboId + ".focus();")
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert.isNull(navigatedDescendant, "navigatedDescendant should be still null.");
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^France/.test(navigatedDescendant),
+					"navigatedDescendant after first ARROW_DOWN: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.pressKeys(keys.ARROW_DOWN)
+			.pressKeys(keys.ARROW_DOWN)
+			.pressKeys(keys.ARROW_DOWN) // focus on Cananda
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^Canada/.test(navigatedDescendant),
+					"navigatedDescendant after forth ARROW_DOWN: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ESCAPE)
+			.sleep(500) // wait for async closing
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				// note: even if the popup it's closed, list should maintain its navigatedDescendant set.
+				assert(/^Canada/.test(navigatedDescendant),
+					"navigatedDescendant after closing the popup: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500) // wait for async opening
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^Canada/.test(navigatedDescendant),
+					"navigatedDescendant after opening the popup: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.pressKeys(keys.ARROW_DOWN) // focus on Cananda
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^China/.test(navigatedDescendant),
+					"navigatedDescendant after two ARROW_DOWN: " + navigatedDescendant);
+			});
+	};
+
+	var checkNavigatedDescendantWithSelection = function (remote, comboId) {
+		var executeExpr = "return getNavigatedDescendant(\"" + comboId + "\");";
+		return loadFile(remote, "./Combobox-decl.html")
+			.execute(comboId + ".focus();")
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert.isNull(navigatedDescendant, "navigatedDescendant should be still null.");
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^France/.test(navigatedDescendant),
+					"navigatedDescendant after first ARROW_DOWN: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.pressKeys(keys.ARROW_DOWN)
+			.findById(comboId + "_item2")
+			.click() // UK selected
+			.end()
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^UK/.test(navigatedDescendant),
+					"navigatedDescendant after two ARROW_DOWN: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^Canada/.test(navigatedDescendant),
+					"navigatedDescendant after other two ARROW_DOWN: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ESCAPE)
+			.sleep(500) // wait for async closing
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				// note: even if the popup it's closed, list should maintain its navigatedDescendant set.
+				assert(/^Canada/.test(navigatedDescendant),
+					"navigatedDescendant after closing the popup: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500) // wait for async opening
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				// note: on opening, the widget does focus on the navigated descendant
+				assert(/^Canada/.test(navigatedDescendant),
+					"navigatedDescendant after opening the popup: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.pressKeys(keys.ARROW_DOWN) // focus on Cananda
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^China/.test(navigatedDescendant),
+					"navigatedDescendant after two ARROW_DOWN: " + navigatedDescendant);
+			});
+	};
+
+	var checkNavigatedDescendantWithPreSelection = function (remote, comboId) {
+		var executeExpr = "return getNavigatedDescendant(\"" + comboId + "\");";
+		return loadFile(remote, "./Combobox-decl.html")
+			.execute("document.getElementById(\"" + comboId + "\").focus();")
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				// note: Germany is preselected.
+				assert(/^Germany/.test(navigatedDescendant),
+					"navigatedDescendant after first ARROW_DOWN: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500)
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				assert(/^UK/.test(navigatedDescendant),
+					"navigatedDescendant after second ARROW_DOWN: " + navigatedDescendant);
+			})
+			.pressKeys(keys.ESCAPE)
+			.sleep(500) // wait for async closing
+			.pressKeys(keys.ARROW_DOWN)
+			.sleep(500) // wait for async opening
+			.execute(executeExpr)
+			.then(function (navigatedDescendant) {
+				// note: on opening, the widget does focus on the navigated descendant
+				assert(/^UK/.test(navigatedDescendant),
+					"navigatedDescendant after opening the popup: " + navigatedDescendant);
+			});
+	};
+
 	var checkPopupPosition = function (remote, comboId, position) {
 		return loadFile(remote, "./Combobox-decl.html")
 			.execute("return moveToBottom(\"" + comboId + "\");")
@@ -914,6 +1059,48 @@ define([
 			.end();
 	};
 
+	var checkReadonlyForEmptyStore = function (remote, comboId) {
+		return loadFile(remote, "./Combobox-decl.html")
+			.findByCssSelector("#" + comboId + " .d-combobox-input")
+			.getAttribute("readonly")
+			.then(function (value) {
+				assert.strictEqual(value, "", comboId + ":readonly attribute after page load");
+			})
+			.end()
+			.findByCssSelector("#" + comboId + " .d-combobox-arrow")
+			.click() // popup opens
+			.sleep(250)
+			.end()
+			.findById(comboId + "_dropdown")
+			.getVisibleText()
+			.then(function (visibleText) {
+				assert(/^Nothing to show./.test(visibleText),
+					"The popup should show `Nothing to show.`");
+			})
+			.end();
+	};
+
+	var checkReadonlyForNotEmptyStore = function (remote, comboId) {
+		return loadFile(remote, "./Combobox-decl.html")
+			.findByCssSelector("#" + comboId + " .d-combobox-input")
+			.getAttribute("readonly")
+			.then(function (value) {
+				assert.strictEqual(value, null, comboId + ":readonly attribute after page load");
+			})
+			.end()
+			.findByCssSelector("#" + comboId + " .d-combobox-arrow")
+			.click() // popup opens
+			.sleep(250)
+			.end()
+			.findById(comboId + "_dropdown")
+			.getVisibleText()
+			.then(function (visibleText) {
+				assert.isFalse(/^Nothing to show./.test(visibleText),
+					"The popup should not show `Nothing to show.`");
+			})
+			.end();
+	};
+
 	var checkFilteringWithZeroFilterChars = function (remote, comboId) {
 		var executeExpr = "return getComboState(\"" + comboId + "\");";
 		return loadFile(remote, "./Combobox-decl.html")
@@ -1086,6 +1273,111 @@ define([
 			.end();
 	};
 
+	var checkFilteringAutoCompleteMode = function (remote, comboId) {
+		var executeExpr = "return getComboState(\"" + comboId + "\");";
+		return loadFile(remote, "./Combobox-decl.html")
+			.findByCssSelector("#" + comboId + " .d-combobox-input")
+			.getAttribute("readonly")
+			.then(function (value) {
+				assert.strictEqual(value, null, comboId + ":readonly attribute after page load");
+			})
+			.click()
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "",
+						widgetValue: "",
+						valueNodeValue: "",
+						opened: false, // click() does not open the popup.
+						selectedItemsCount: 0,
+						itemRenderersCount: 37, // the source is already attached, so items are already rendered.
+						inputEventCounter: 0, // unchanged
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: undefined,
+						valueNodeValueAtLatestInputEvent: undefined,
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after page load.");
+			})
+			.pressKeys("g")
+			.pressKeys("e")
+			.pressKeys("r")
+			.pressKeys("m")
+			.execute(executeExpr)
+			.then(function (comboState) { // Filtering happened.
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "germ",
+						widgetValue: "germ",
+						valueNodeValue: "germ",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 1,
+						inputEventCounter: 4,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "germ",
+						valueNodeValueAtLatestInputEvent: "germ",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `germ` chars.");
+			})
+			.pressKeys("w") // germw -> not maching items
+			.execute(executeExpr)
+			.then(function (comboState) {
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "germw",
+						widgetValue: "germw",
+						valueNodeValue: "germw",
+						opened: true,
+						selectedItemsCount: 0,
+						itemRenderersCount: 0,
+						inputEventCounter: 1,
+						changeEventCounter: 0,
+						widgetValueAtLatestInputEvent: "germw",
+						valueNodeValueAtLatestInputEvent: "germw",
+						widgetValueAtLatestChangeEvent: undefined,
+						valueNodeValueAtLatestChangeEvent: undefined
+					}, "after typing `w`.");
+			})
+			.end()
+			.findById(comboId + "_dropdown") // List's showNoItems is true.
+			.getVisibleText()
+			.then(function (visibleText) {
+				assert(/^Nothing to show./.test(visibleText),
+					"The popup should show `Nothing to show.`");
+			})
+			.end()
+			.findByCssSelector("#" + comboId + " .d-combobox-input")
+			.pressKeys(keys.BACKSPACE) // clearing `w`.
+			.sleep(250)
+			.end()
+			.execute("storeTestingInfo(document.getElementById(\"" + comboId + "\"));")
+			.findByCssSelector("#" + comboId + "_item0")
+			.click() // Germany selected
+			.sleep(250)
+			.execute(executeExpr)
+			.then(function (comboState) { // We get full list.
+				checkComboState(comboId, comboState,
+					{ // expected combo state
+						inputNodeValue: "Germany",
+						widgetValue: "Germany",
+						valueNodeValue: "Germany",
+						opened: false,
+						selectedItemsCount: 1,
+						itemRenderersCount: 37, // query gets reset
+						inputEventCounter: 2, // incremented.
+						changeEventCounter: 1, // there was a commit/
+						widgetValueAtLatestInputEvent: "Germany",
+						valueNodeValueAtLatestInputEvent: "Germany",
+						widgetValueAtLatestChangeEvent: "Germany",
+						valueNodeValueAtLatestChangeEvent: "Germany"
+					}, "after selecting `Germany` item.");
+			})
+			.end();
+	};
+
 	registerSuite({
 		name: "Combobox - functional",
 
@@ -1191,6 +1483,30 @@ define([
 			return checkKeyboardNavigationAutoscroll(remote, "combo3");
 		},
 
+		"check navigatedDescendant (no selection)": function () {
+			var remote = this.remote;
+			if (remote.environmentType.brokenSendKeys || !remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support");
+			}
+			return checkNavigatedDescendantNoSelection(remote, "combo3");
+		},
+
+		"check navigatedDescendant (with selection)": function () {
+			var remote = this.remote;
+			if (remote.environmentType.brokenSendKeys || !remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support");
+			}
+			return checkNavigatedDescendantWithSelection(remote, "combo3");
+		},
+
+		"check navigatedDescendant (with pre-selection)": function () {
+			var remote = this.remote;
+			if (remote.environmentType.brokenSendKeys || !remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support");
+			}
+			return checkNavigatedDescendantWithPreSelection(remote, "combo2-custom-sel-multiple");
+		},
+
 		"mouse navigation selectionMode=single, autoFilter=false": function () {
 			var remote = this.remote;
 			if (remote.environmentType.browserName === "internet explorer") {
@@ -1242,6 +1558,31 @@ define([
 			return checkRequestCount(remote, "combo-slowstore");
 		},
 
+		"check readonly (empty store)": function () {
+			var remote = this.remote;
+			if (remote.environmentType.browserName === "internet explorer") {
+				// https://github.com/theintern/leadfoot/issues/17
+				return this.skip("click() doesn't generate mousedown/mouseup, so popup won't open");
+			}
+			if (remote.environmentType.brokenSendKeys || !remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support");
+			}
+			return checkReadonlyForEmptyStore(remote, "combo-empty-store");
+		},
+
+		"check readonly (non-empty store and autoFilter = true) ": function () {
+			var remote = this.remote;
+			if (remote.environmentType.browserName === "internet explorer") {
+				// https://github.com/theintern/leadfoot/issues/17
+				return this.skip("click() doesn't generate mousedown/mouseup, so popup won't open");
+			}
+			if (remote.environmentType.brokenSendKeys || !remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support");
+			}
+			// combo2 has autoFilter true and a non-empty store. Readonly attr has to be false.
+			return checkReadonlyForNotEmptyStore(remote, "combo2");
+		},
+
 		"filtering with minimum characters (0)": function () {
 			var remote = this.remote;
 			if (remote.environmentType.browserName === "internet explorer") {
@@ -1264,6 +1605,18 @@ define([
 				return this.skip("no keyboard support");
 			}
 			return checkFilteringWithThreeFilterChars(remote, "combo-minfilterchars3");
+		},
+
+		"filtering in auto complete mode": function () {
+			var remote = this.remote;
+			if (remote.environmentType.browserName === "internet explorer") {
+				// https://github.com/theintern/leadfoot/issues/17
+				return this.skip("click() doesn't generate mousedown/mouseup, so popup won't open");
+			}
+			if (remote.environmentType.brokenSendKeys || !remote.environmentType.nativeEvents) {
+				return this.skip("no keyboard support");
+			}
+			return checkFilteringAutoCompleteMode(remote, "combo-autocomplete");
 		}
 	});
 });
diff --git a/tests/unit/Combobox.js b/tests/unit/Combobox.js
index e83eeb8e57..41579b902e 100644
--- a/tests/unit/Combobox.js
+++ b/tests/unit/Combobox.js
@@ -203,6 +203,7 @@ define([
 		assert.strictEqual(combo.baseClass, outerCSS, "combo.baseClass");
 		assert.strictEqual(combo.filterMode, "startsWith", "combo.filterMode");
 		assert.isTrue(combo.ignoreCase, "combo.ignoreCase");
+		assert.strictEqual(combo.inputNode.placeholder, "Search", combo.inputNode.placeholder);
 	};
 
 	var CommonTestCases = {
@@ -611,6 +612,106 @@ define([
 			return d;
 		},
 
+		"widget.inputNode aria-expanded attribute on open/close popup": function () {
+			var combo = new Combobox({labelAttr: "name"});
+			var dataSource = new Memory(
+				{idProperty: "name",
+					data: [
+					{ name: "Japan", sales: 900, profit: 100, region: "Asia" },
+					{ name: "France", sales: 500, profit: 50, region: "EU" },
+					{ name: "Germany", sales: 450, profit: 48, region: "EU" },
+					{ name: "UK", sales: 700, profit: 60, region: "EU" },
+					{ name: "USA", sales: 2000, profit: 250, region: "America" },
+					{ name: "Canada", sales: 600, profit: 30, region: "America" },
+					{ name: "Brazil", sales: 450, profit: 30, region: "America" },
+					{ name: "China", sales: 500, profit: 40, region: "Asia" }
+				]});
+			combo.source = dataSource;
+			container.appendChild(combo);
+			combo.attachedCallback();
+			combo.deliver();
+
+			var d = this.async(2000);
+			assert.strictEqual(combo.inputNode.getAttribute("aria-expanded"), "false",
+				"aria-expanded - popup is closed: " + combo.id);
+
+			combo.openDropDown().then(d.rejectOnError(function () {
+				assert.strictEqual(combo.inputNode.getAttribute("aria-expanded"), "true",
+				"aria-expanded - popup is open: " + combo.id);
+				combo.closeDropDown();
+				setTimeout(d.callback(function () {
+					assert.strictEqual(combo.inputNode.getAttribute("aria-expanded"), "false",
+					"aria-expanded - popup is closed: " + combo.id);
+				}), 200);
+			}));
+
+			return d;
+		},
+
+		"widget.inputNode readOnly attribute": function () {
+			var combo = new Combobox({labelAttr: "name", autoFilter: true});
+			var dataSource = new Memory(
+				{idProperty: "name",
+					data: [
+					{ name: "Japan", sales: 900, profit: 100, region: "Asia" },
+					{ name: "France", sales: 500, profit: 50, region: "EU" },
+					{ name: "Canada", sales: 600, profit: 30, region: "America" },
+					{ name: "Brazil", sales: 450, profit: 30, region: "America" },
+					{ name: "China", sales: 500, profit: 40, region: "Asia" }
+				]});
+			container.appendChild(combo);
+			combo.attachedCallback();
+			combo.deliver();
+
+			assert.isTrue(combo.inputNode.readOnly,
+				"readOnly should be true, because source is empty.");
+
+			combo.source = dataSource;
+			combo.deliver();
+			assert.isFalse(combo.inputNode.readOnly,
+				"readOnly should be false, because source is not empty.");
+		},
+
+		"widget.inputNode read0nly attribute on list source change.": function () {
+			var combo = new Combobox({labelAttr: "name", autoFilter: true});
+			var dataSource = new Memory(
+				{idProperty: "name",
+					data: [
+					{ name: "Japan", sales: 900, profit: 100, region: "Asia" },
+					{ name: "France", sales: 500, profit: 50, region: "EU" },
+					{ name: "Canada", sales: 600, profit: 30, region: "America" },
+					{ name: "Brazil", sales: 450, profit: 30, region: "America" },
+					{ name: "China", sales: 500, profit: 40, region: "Asia" }
+				]});
+
+			var dataSourceEmpty = new Memory({idProperty: "name", data: []});
+
+			container.appendChild(combo);
+			combo.source = dataSource;
+			combo.attachedCallback();
+			combo.deliver();
+
+			assert.isFalse(combo.inputNode.readOnly,
+				"readOnly should be true, because source is not empty and autoFilter is true.");
+
+			var d = this.async(2000);
+			var delay = 200;
+			// open the dropdown, so the list gets combo's source attached.
+			combo.openDropDown().then(d.rejectOnError(function () {
+				setTimeout(d.callback(function () {
+					combo.closeDropDown();
+					// attaching an empty source to the list.
+					combo.list.source = dataSourceEmpty;
+					combo.list.deliver();
+					combo.deliver();
+					assert.isTrue(combo.inputNode.readOnly,
+						"readOnly should be true, because source is now empty.");
+				}), delay);
+			}));
+
+			return d;
+		},
+
 		// Test case for #509: initialization of Combobox after List rendering is ready.
 		// "initialization with List rendering after Combobox initialization": function () {
 		// 	var combo = new Combobox(); // single selection mode