diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index dccbbde35d..8d988def2c 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -17,6 +17,7 @@
 		<link rel=stylesheet href="lib/ve/modules/ve/ce/styles/nodes/ve.ce.FocusableNode.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ce/styles/nodes/ve.ce.AlienNode.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ce/styles/nodes/ve.ce.BranchNode.css">
+		<link rel=stylesheet href="lib/ve/modules/ve/ce/styles/nodes/ve.ce.CommentNode.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ce/styles/nodes/ve.ce.DocumentNode.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ce/styles/nodes/ve.ce.GeneratedContentNode.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ce/styles/nodes/ve.ce.ImageNode.css">
@@ -33,6 +34,7 @@
 		<link rel=stylesheet href="lib/ve/modules/ve/ui/styles/widgets/ve.ui.ContextMenuWidget.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ui/styles/widgets/ve.ui.DimensionsWidget.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ui/styles/widgets/ve.ui.MediaSizeWidget.css">
+		<link rel=stylesheet href="lib/ve/modules/ve/ui/styles/inspectors/ve.ui.CommentInspector.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ui/styles/inspectors/ve.ui.FragmentInspector.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ui/styles/inspectors/ve.ui.LinkInspector.css">
 		<link rel=stylesheet href="lib/ve/modules/ve/ui/styles/inspectors/ve.ui.SpecialCharacterInspector.css">
@@ -199,6 +201,7 @@
 		<script src="lib/ve/modules/ve/dm/annotations/ve.dm.VariableAnnotation.js"></script>
 		<script src="lib/ve/modules/ve/dm/metaitems/ve.dm.AlienMetaItem.js"></script>
 		<script src="lib/ve/modules/ve/dm/metaitems/ve.dm.CommentMetaItem.js"></script>
+		<script src="lib/ve/modules/ve/dm/nodes/ve.dm.CommentNode.js"></script>
 		<script src="lib/ve/modules/ve/ce/ve.ce.js"></script>
 		<script src="lib/ve/modules/ve/ce/ve.ce.DomRange.js"></script>
 		<script src="lib/ve/modules/ve/ce/ve.ce.AnnotationFactory.js"></script>
@@ -218,6 +221,7 @@
 		<script src="lib/ve/modules/ve/ce/nodes/ve.ce.AlienNode.js"></script>
 		<script src="lib/ve/modules/ve/ce/nodes/ve.ce.BreakNode.js"></script>
 		<script src="lib/ve/modules/ve/ce/nodes/ve.ce.CenterNode.js"></script>
+		<script src="lib/ve/modules/ve/ce/nodes/ve.ce.CommentNode.js"></script>
 		<script src="lib/ve/modules/ve/ce/nodes/ve.ce.DefinitionListItemNode.js"></script>
 		<script src="lib/ve/modules/ve/ce/nodes/ve.ce.DefinitionListNode.js"></script>
 		<script src="lib/ve/modules/ve/ce/nodes/ve.ce.DivNode.js"></script>
@@ -306,6 +310,7 @@
 		<script src="lib/ve/modules/ve/ui/inspectors/ve.ui.InsertionInspector.js"></script>
 		<script src="lib/ve/modules/ve/ui/inspectors/ve.ui.NodeInspector.js"></script>
 		<script src="lib/ve/modules/ve/ui/inspectors/ve.ui.LinkInspector.js"></script>
+		<script src="lib/ve/modules/ve/ui/inspectors/ve.ui.CommentInspector.js"></script>
 		<script src="lib/ve/modules/ve/ui/inspectors/ve.ui.LanguageInspector.js"></script>
 		<script src="lib/ve/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js"></script>
 
diff --git a/VisualEditor.php b/VisualEditor.php
index 91f9d75ff0..7e63a3e1fc 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -356,6 +356,7 @@ $wgResourceModules += array(
 			'lib/ve/modules/ve/dm/nodes/ve.dm.AlienNode.js',
 			'lib/ve/modules/ve/dm/nodes/ve.dm.BreakNode.js',
 			'lib/ve/modules/ve/dm/nodes/ve.dm.CenterNode.js',
+			'lib/ve/modules/ve/dm/nodes/ve.dm.CommentNode.js',
 			'lib/ve/modules/ve/dm/nodes/ve.dm.DefinitionListItemNode.js',
 			'lib/ve/modules/ve/dm/nodes/ve.dm.DefinitionListNode.js',
 			'lib/ve/modules/ve/dm/nodes/ve.dm.DivNode.js',
@@ -420,6 +421,7 @@ $wgResourceModules += array(
 			'lib/ve/modules/ve/ce/nodes/ve.ce.AlienNode.js',
 			'lib/ve/modules/ve/ce/nodes/ve.ce.BreakNode.js',
 			'lib/ve/modules/ve/ce/nodes/ve.ce.CenterNode.js',
+			'lib/ve/modules/ve/ce/nodes/ve.ce.CommentNode.js',
 			'lib/ve/modules/ve/ce/nodes/ve.ce.DefinitionListItemNode.js',
 			'lib/ve/modules/ve/ce/nodes/ve.ce.DefinitionListNode.js',
 			'lib/ve/modules/ve/ce/nodes/ve.ce.DivNode.js',
@@ -510,6 +512,7 @@ $wgResourceModules += array(
 			'lib/ve/modules/ve/ui/inspectors/ve.ui.AnnotationInspector.js',
 			'lib/ve/modules/ve/ui/inspectors/ve.ui.InsertionInspector.js',
 			'lib/ve/modules/ve/ui/inspectors/ve.ui.NodeInspector.js',
+			'lib/ve/modules/ve/ui/inspectors/ve.ui.CommentInspector.js',
 			'lib/ve/modules/ve/ui/inspectors/ve.ui.LinkInspector.js',
 
 			'lib/ve/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js',
@@ -519,6 +522,7 @@ $wgResourceModules += array(
 		),
 		'styles' => array(
 			// ce
+			'lib/ve/modules/ve/ce/styles/nodes/ve.ce.CommentNode.css',
 			'lib/ve/modules/ve/ce/styles/nodes/ve.ce.FocusableNode.css',
 			'lib/ve/modules/ve/ce/styles/nodes/ve.ce.AlienNode.css',
 			'lib/ve/modules/ve/ce/styles/nodes/ve.ce.BranchNode.css',
@@ -571,6 +575,10 @@ $wgResourceModules += array(
 			'visualeditor-clipboard-cut',
 			'visualeditor-clipboard-paste',
 			'visualeditor-clipboard-paste-special',
+			'visualeditor-commentinspector-edit',
+			'visualeditor-commentinspector-insert',
+			'visualeditor-commentinspector-title',
+			'visualeditor-commentinspector-tooltip',
 			'visualeditor-dialog-action-apply',
 			'visualeditor-dialog-action-cancel',
 			'visualeditor-dialog-action-done',
diff --git a/lib/ve b/lib/ve
index 1bfcb1658b..44241950ec 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 1bfcb1658b7419c01eb491c61f2bf0da3d0f2219
+Subproject commit 44241950ec50819098c07076fc7bd9bcc8e0a06d
diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
index 1a97c1cb66..6c78e984f9 100644
--- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
@@ -315,12 +315,12 @@ ve.dm.mwExample.mwNowikiHtml = '<body><p>Foo<span typeof="mw:Nowiki">[[Bar]]</sp
 
 ve.dm.mwExample.withMeta = [
 	{
-		'type': 'comment',
+		'type': 'commentMeta',
 		'attributes': {
 			'text': ' No content conversion '
 		}
 	},
-	{ 'type': '/comment' },
+	{ 'type': '/commentMeta' },
 	{
 		'type': 'mwAlienMeta',
 		'attributes': {
@@ -383,12 +383,12 @@ ve.dm.mwExample.withMeta = [
 	},
 	{ 'type': '/mwAlienMeta' },
 	{
-		'type': 'comment',
+		'type': 'commentMeta',
 		'attributes': {
 			'text': 'barbaz'
 		}
 	},
-	{ 'type': '/comment' },
+	{ 'type': '/commentMeta' },
 	{
 		'type': 'mwCategory',
 		'attributes': {
@@ -1468,7 +1468,6 @@ ve.dm.mwExample.domToDataCases = {
 				'type': 'paragraph'
 			},
 			'F', 'o', 'o',
-			{ 'type': '/paragraph' },
 			{
 				'type': 'comment',
 				'attributes': {
@@ -1476,6 +1475,7 @@ ve.dm.mwExample.domToDataCases = {
 				}
 			},
 			{ 'type': '/comment' },
+			{ 'type': '/paragraph' },
 			{ 'type': '/internalItem' },
 			{ 'type': '/internalList' }
 		]