diff --git a/js/lib/dom.cleanup.js b/js/lib/dom.cleanup.js
index <HASH>..<HASH> 100644
--- a/js/lib/dom.cleanup.js
+++ b/js/lib/dom.cleanup.js
@@ -35,7 +35,13 @@ function cleanupAndSaveDataParsoid( node ) {
 		if (dp) {
 			// Delete empty auto-inserted elements
 			var next = node.nextSibling;
-			if (node.childNodes.length === 0 && dp.autoInsertedStart && dp.autoInsertedEnd) {
+			if ((node.childNodes.length === 0 ||
+						node.childNodes.length === 1 && /^\s*$/.test(node.textContent)) &&
+					dp.autoInsertedStart && dp.autoInsertedEnd) {
+				if (node.childNodes.length === 1) {
+					// migrate the ws out
+					node.parentNode.insertBefore(node.firstChild, node);
+				}
 				DU.deleteNode(node);
 				return next;
 			}
Bug <I>: Strip ws-only auto-inserted table cells too

This patch migrates that ws out of the table cells into inter-element
whitespace.

Change-Id: I1a<I>cc7bf5d7dd5abee<I>f<I>f<I>cec<I>