diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid
index a1fa201dc2..35d6665bd1 100644
--- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid	
+++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid	
@@ -1,6 +1,8 @@
 title: TiddlyWiki Pre-release
 modified: 20150428204930183
 
+{{HelloThere||$:/plugins/tiddlywiki/internals/EditTemplate/body/preview/parse-tree}}
+
 This is a pre-release build of TiddlyWiki, [[also available in empty form|https://tiddlywiki.com/prerelease/empty.html]]. It is provided for testing purposes. ''Please don't try to use it for anything important'' -- you should use the latest official release from https://tiddlywiki.com.
 
 <$list filter="[tag[ReleaseNotes]!has[released]!sort[created]]">
diff --git a/editions/test/tiddlers/tests/data/transclude/Mario.tid b/editions/test/tiddlers/tests/data/transclude/Mario.tid
new file mode 100644
index 0000000000..6bb6b75430
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/transclude/Mario.tid
@@ -0,0 +1,28 @@
+title: UnwantedParagraphs
+description: Unwanted paragraph elements when using slot/fill
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+\procedure hello
+\whitespace trim
+<div class="frame">
+<$slot $name="greeting"/>
+</div>
+\end
+
+<div class="tc-outer">
+<$transclude $variable="hello" mode="inline">
+<$fill $name="greeting">
+<h1>A heading</h1>
+<p>A paragraph</p>
+</$fill>
+</$transclude>
+</div>
+
++
+title: ExpectedResult
+
+<p><div class="tc-outer"><div class="frame"><h1>A heading</h1><p>A paragraph</p></div></div></p>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
index 7a464c7db9..21cf7f110c 100644
--- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
@@ -5,6 +5,10 @@ tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki
 
+<div a="foo" b={{foo}} c=<<bar x:"one" y:"two" z>>>
+This
+</div>
+
 ''Have you ever had the feeling that your head is not quite big enough to hold everything you need to remember?''
 
 Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information.
diff --git a/plugins/tiddlywiki/internals/state-editpreviewtype.tid b/plugins/tiddlywiki/internals/state-editpreviewtype.tid
new file mode 100644
index 0000000000..3879f1fde1
--- /dev/null
+++ b/plugins/tiddlywiki/internals/state-editpreviewtype.tid
@@ -0,0 +1,2 @@
+title: $:/state/editpreviewtype
+text: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/parse-tree
\ No newline at end of file
diff --git a/plugins/tiddlywiki/internals/state-showeditpreview.tid b/plugins/tiddlywiki/internals/state-showeditpreview.tid
new file mode 100644
index 0000000000..9a458102a5
--- /dev/null
+++ b/plugins/tiddlywiki/internals/state-showeditpreview.tid
@@ -0,0 +1,2 @@
+title: $:/state/showeditpreview
+text: yes
\ No newline at end of file