diff --git a/core/src/main/resources/lib/foo.jelly b/core/src/main/resources/lib/foo.jelly
index 211b7d2eca9da6c0dbda324560244aac6ba49851..cffa14e994b9abcd53c5026e42eb4d3532ab65eb 100644
--- a/core/src/main/resources/lib/foo.jelly
+++ b/core/src/main/resources/lib/foo.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <b>JELLY TAG FILE ${value}</b>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly
index 745e07d6c71cd560f4b36b4c08b31d993db1e100..cdd0f7a559f1a3bf9108e808581bccad05b34279 100644
--- a/core/src/main/resources/lib/hudson/artifactList.jelly
+++ b/core/src/main/resources/lib/hudson/artifactList.jelly
@@ -22,6 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Generates a listing of the build artifacts.
@@ -48,7 +50,7 @@ THE SOFTWARE.
             <ul>
               <j:forEach var="f" items="${artifacts}">
                 <li>
-                  <a href="${baseURL}artifact/${f.href}">${h.xmlEscape(f.displayPath)}</a>
+                  <a href="${baseURL}artifact/${f.href}">${f.displayPath}</a>
                   <st:nbsp/>
                   <a href="${baseURL}artifact/${f.href}/*fingerprint*/"><img src="${imagesURL}/16x16/fingerprint.gif" alt="[fingerprint]" height="16" width="16" /></a>
                 </li>
diff --git a/core/src/main/resources/lib/hudson/buildHealth.jelly b/core/src/main/resources/lib/hudson/buildHealth.jelly
index 5b72f29c4aaee2e7faae486454a8c3e19ea924fe..4670d6529c5c267ed19fe6cf57458ae8d4ecf9e9 100644
--- a/core/src/main/resources/lib/hudson/buildHealth.jelly
+++ b/core/src/main/resources/lib/hudson/buildHealth.jelly
@@ -28,6 +28,7 @@ THE SOFTWARE.
   <%@ attribute name="td" required="false" type="java.lang.String" %>
   <%@ attribute name="link" required="false" type="java.lang.String" %>
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <j:set var="buildHealth" value="${job.buildHealth}"/>
     <j:if test="${td}"><j:set var="useTdElement" value="x"/></j:if>
diff --git a/core/src/main/resources/lib/hudson/buildLink.jelly b/core/src/main/resources/lib/hudson/buildLink.jelly
index cf1b5ef24f31fdac3d3c3ba1a78f3f7e26153c20..d4c158dee348d4e55ac5371a7fd84051685d702c 100644
--- a/core/src/main/resources/lib/hudson/buildLink.jelly
+++ b/core/src/main/resources/lib/hudson/buildLink.jelly
@@ -31,6 +31,7 @@ THE SOFTWARE.
     number     build number to link to.
     href       Link target. If missing, the top page of the build.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:set var="jobName_" value="${h.appendSpaceIfNotNull(jobName)}"/>
   <j:choose>
diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly
index b15afe6600a342b5f1ec6e6774185b45e855dfed..79aa6d7ebb26be816759cb60bc04f38bdf77b1e6 100644
--- a/core/src/main/resources/lib/hudson/buildListTable.jelly
+++ b/core/src/main/resources/lib/hudson/buildListTable.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:documentation>
     Creates a table of builds.
diff --git a/core/src/main/resources/lib/hudson/buildStatusSummary.jelly b/core/src/main/resources/lib/hudson/buildStatusSummary.jelly
index 757b4c3d0e1aba6d8d94141d5397b69497ba7e2d..1dcda17c9793536259a0bee2ce407790b0c31e4b 100644
--- a/core/src/main/resources/lib/hudson/buildStatusSummary.jelly
+++ b/core/src/main/resources/lib/hudson/buildStatusSummary.jelly
@@ -22,14 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <j:set var="summary" value="${build.buildStatusSummary}"/>
     <j:choose>
         <j:when test="${summary.isWorse}">
-          <font color='red'>${summary.message}</font>
+          <font color='red'><j:out value="${summary.message}"/></font>
         </j:when>
         <j:otherwise>
-          ${summary.message}
+          <j:out value="${summary.message}"/>
         </j:otherwise>
     </j:choose>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/iconSize.jelly b/core/src/main/resources/lib/hudson/iconSize.jelly
index 386e4492a84821f4df4f03f119f0e5a08549c598..5f5ec7f4b3efe3d11872f97208c7355d053d4ac5 100644
--- a/core/src/main/resources/lib/hudson/iconSize.jelly
+++ b/core/src/main/resources/lib/hudson/iconSize.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <table style="width:100%">
     <tr>
diff --git a/core/src/main/resources/lib/hudson/jobLink.jelly b/core/src/main/resources/lib/hudson/jobLink.jelly
index 30b22baca7d2939c8f4d8b7f2e48dd0a2586b473..abc99fe4249de23e28cad67074c4ed2b758037c2 100644
--- a/core/src/main/resources/lib/hudson/jobLink.jelly
+++ b/core/src/main/resources/lib/hudson/jobLink.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Generates a link to a job.
diff --git a/core/src/main/resources/lib/hudson/newFromList/form.jelly b/core/src/main/resources/lib/hudson/newFromList/form.jelly
index fe0bbe58f32004b067cb9fbf8be5eee38230bd82..9c6ffe067ad8d5f76112ff1959b2205dd63b6cd6 100644
--- a/core/src/main/resources/lib/hudson/newFromList/form.jelly
+++ b/core/src/main/resources/lib/hudson/newFromList/form.jelly
@@ -32,6 +32,7 @@ THE SOFTWARE.
     @copyNames   : options of names to choose from as the copy source. null to hide "copy" option
     @checkUrl    : form field validation url
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <j:set var="descriptors" value="${h.filterDescriptors(it,attrs.descriptors)}" />
 
diff --git a/core/src/main/resources/lib/hudson/node.jelly b/core/src/main/resources/lib/hudson/node.jelly
index 8013ef70cb1d35a2a2be73a9395e0ace7d5c9568..18e30b0748538541025057719b352aeb13c54f9f 100644
--- a/core/src/main/resources/lib/hudson/node.jelly
+++ b/core/src/main/resources/lib/hudson/node.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Displays a link to a node.
diff --git a/core/src/main/resources/lib/hudson/progressiveText.jelly b/core/src/main/resources/lib/hudson/progressiveText.jelly
index 75430b095e687edd5ab0ebe1f7d915ed23ed16d0..91e7c123b7a3265974dc68d075ec670a9c886ccf 100644
--- a/core/src/main/resources/lib/hudson/progressiveText.jelly
+++ b/core/src/main/resources/lib/hudson/progressiveText.jelly
@@ -32,6 +32,7 @@ THE SOFTWARE.
 	<%@attribute name="spinner" required="false" description="ID of the HTML element in which the spinner is displayed" %>
 	<%@attribute name="startOffset" required="false" description="Skip this many bytes rather than showing from start of data" %>
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<!--
 	  script code
diff --git a/core/src/main/resources/lib/hudson/project/build-permalink.jelly b/core/src/main/resources/lib/hudson/project/build-permalink.jelly
index 689fb9d1b7d4b95dc36d1f49865be8d1ce66fadd..a62e64da710078cb9592a1210e12acef0ae1ae3d 100644
--- a/core/src/main/resources/lib/hudson/project/build-permalink.jelly
+++ b/core/src/main/resources/lib/hudson/project/build-permalink.jelly
@@ -31,6 +31,7 @@ THE SOFTWARE.
       Title of the link
 -->
         <!-- TODO: delete once batch-task plugin is updated. -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
   <j:set var="b" value="${it[property]}"/>
   <j:if test="${b!=null}">
diff --git a/core/src/main/resources/lib/hudson/project/matrix.jelly b/core/src/main/resources/lib/hudson/project/matrix.jelly
index b8338f6f75cac393aba59e73a58a79e0defbeeb7..d944a79011be7f1366ccc25826bfaedbfa484c8f 100644
--- a/core/src/main/resources/lib/hudson/project/matrix.jelly
+++ b/core/src/main/resources/lib/hudson/project/matrix.jelly
@@ -28,6 +28,7 @@ THE SOFTWARE.
 
   Used by Matrix* classes
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <st:documentation>
     Generate configuration matrix and invoke body with 'p' as the instance of T
diff --git a/core/src/main/resources/lib/hudson/project/upstream-downstream.jelly b/core/src/main/resources/lib/hudson/project/upstream-downstream.jelly
index e33453791c74a305b5e28161a0f0750e664b2683..109a21bd181b0cf76b424e84445e777f41dd0230 100644
--- a/core/src/main/resources/lib/hudson/project/upstream-downstream.jelly
+++ b/core/src/main/resources/lib/hudson/project/upstream-downstream.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Display upstream/downstream projects
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:local="local">
   <d:taglib uri="local">
     <d:tag name="relationship">
diff --git a/core/src/main/resources/lib/hudson/projectViewNested.jelly b/core/src/main/resources/lib/hudson/projectViewNested.jelly
index 85bda65a403b0cbafa821a3ba2aaf62365fb24bb..d7b26e9b4a4db1fe20791c03da94839be933c8d6 100644
--- a/core/src/main/resources/lib/hudson/projectViewNested.jelly
+++ b/core/src/main/resources/lib/hudson/projectViewNested.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Renders the nest view in <projectView />
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <tr>
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index 580c8e0abee56f0928dec91ee80c6163681ad4c6..c62c1e1fe1bdadaf1bbe87ae35118c7139d630da 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Displays the build queue as &lt;l:pane>
diff --git a/core/src/main/resources/lib/hudson/test-result.jelly b/core/src/main/resources/lib/hudson/test-result.jelly
index 817401cce4bd08de438be2214d473eeff670665c..890f4c2789866b18e02ba36de7338304d83b7e7e 100644
--- a/core/src/main/resources/lib/hudson/test-result.jelly
+++ b/core/src/main/resources/lib/hudson/test-result.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Evaluates to a sstring that reports the test result number in text, like "(5 failures / +3)".
diff --git a/core/src/main/resources/lib/layout/pane.jelly b/core/src/main/resources/lib/layout/pane.jelly
index bdeced1314931e5b7611695379e5f0058cb76b40..0cb71c1c9de937f2ba43cf4a693e1896331c0de4 100644
--- a/core/src/main/resources/lib/layout/pane.jelly
+++ b/core/src/main/resources/lib/layout/pane.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler">
   <st:documentation>
     Used in the &lt;l:side-panel> to draw a box with a title.
diff --git a/core/src/main/resources/lib/layout/renderOnDemand.jelly b/core/src/main/resources/lib/layout/renderOnDemand.jelly
index dbfe5be127a728a27788f45c2ea7513830407291..eb9378385ead6737c5f5ecd6faebdff2f782aece 100644
--- a/core/src/main/resources/lib/layout/renderOnDemand.jelly
+++ b/core/src/main/resources/lib/layout/renderOnDemand.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:x="jelly:xml">
   <st:documentation>
     <st:attribute name="tag">
diff --git a/core/src/main/resources/lib/layout/tab.jelly b/core/src/main/resources/lib/layout/tab.jelly
index d1c12d87e454c726d80df7f6e062dd8c5cccd29e..84020d3e9b01130ea18ec1186e8d732f820d8545 100644
--- a/core/src/main/resources/lib/layout/tab.jelly
+++ b/core/src/main/resources/lib/layout/tab.jelly
@@ -28,6 +28,7 @@ THE SOFTWARE.
 <%@ attribute name="active" required="true" type="java.lang.Boolean" %>
 <%@ attribute name="title" required="false" type="java.lang.String" %>
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
   <j:choose>
     <j:when test="${tabPass=='pass1'}">
diff --git a/core/src/main/resources/lib/layout/task.jelly b/core/src/main/resources/lib/layout/task.jelly
index 219721729832fab0d2ac1faf523229eae5e16730..f48ac700b066fabb192fccf7d85116694cd0a999 100644
--- a/core/src/main/resources/lib/layout/task.jelly
+++ b/core/src/main/resources/lib/layout/task.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
   <st:documentation>
     This tag inside &lt;l:tasks> tag renders the left navigation bar of Hudson.
diff --git a/core/src/main/resources/lib/test/bar.jelly b/core/src/main/resources/lib/test/bar.jelly
index 87f765cdd14bcdf69cf8c3c6d1355ec197f6a124..0203ad1714c4fa424e50240342e44bf26a83c0f9 100644
--- a/core/src/main/resources/lib/test/bar.jelly
+++ b/core/src/main/resources/lib/test/bar.jelly
@@ -33,6 +33,7 @@ THE SOFTWARE.
 
   both objects need to have .failCount and .totalCount properties
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div>
     <j:choose>
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly
index e40bf09c4d9d6e05dadd34941409b5ffe3322f1b..9b9b110dd17462daaa6621e841d25fc643be40f6 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.fullDisplayName} Execution Record">
     <st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
index 5e565c0164b8ae49bab3b5cb55388c581b14fb03..ae31a6f3c20499ee3300cd3aaf4c79bada0d5b3f 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <st:include page="configure-common.jelly" />
 
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly
index 713030085fe4dfd698c29994b4ed41e20641465f..da25318f882c944f73c95eb35ae5bc458dd72f41 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   list disabled modules
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.name}">
     <st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly
index 0db3522ca3bc339e564df00872e41f5d9ecf23cb..28e5ab17ea3b5b01823bcd1a8646a9f546bb2d09 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly
@@ -23,6 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <l:layout title="${it.name}">
     <st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly
index e91b6e81c17ec12a8c05993f9a3717f98cfc8527..ba5e2309bd186ca4d19499892b9baa7454862270 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:test="/lib/test">
   <l:layout permission="${app.ADMINISTER}" title="${%Thread Dump} - Maven Process for ${it.owner}">
     <st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly
index 39505845a2911857959540631b27e943ea87f0cd..ee30535ac86a5e03e043023df44c58d49213a6dc 100644
--- a/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:test="/lib/test">
   <l:layout>
     <st:include it="${it.owner}" page="sidepanel.jelly" />
diff --git a/test/src/test/resources/hudson/model/DownloadServiceTest/testPost.jelly b/test/src/test/resources/hudson/model/DownloadServiceTest/testPost.jelly
index 74180a08c039f2b358ce75dc2be946c26900cb5b..d8d9e15d7d53c08ae126f0898e63df8adab8bd23 100644
--- a/test/src/test/resources/hudson/model/DownloadServiceTest/testPost.jelly
+++ b/test/src/test/resources/hudson/model/DownloadServiceTest/testPost.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="test">
     <l:main-panel>
diff --git a/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyImpl/summary.jelly b/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyImpl/summary.jelly
index e0e50c9064f859eedf471e5cea54fcbcdfb9e8e0..6ee8ded9dc881df95ae48baf7c6887905f68b03a 100644
--- a/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyImpl/summary.jelly
+++ b/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyImpl/summary.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 ${it.propertyString}
 </j:jelly>
\ No newline at end of file
diff --git a/test/src/test/resources/hudson/model/JobTest/JobPropertyImpl/summary.jelly b/test/src/test/resources/hudson/model/JobTest/JobPropertyImpl/summary.jelly
index f1e40fa1c068a5134949dce2fa41a976ec24f5b4..b3d23b1a44817eeab51500c60a6c1e436de0f2d5 100644
--- a/test/src/test/resources/hudson/model/JobTest/JobPropertyImpl/summary.jelly
+++ b/test/src/test/resources/hudson/model/JobTest/JobPropertyImpl/summary.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 ${it.testString}
 </j:jelly>
\ No newline at end of file
diff --git a/test/src/test/resources/hudson/model/UserTestCase/UserPropertyImpl/summary.jelly b/test/src/test/resources/hudson/model/UserTestCase/UserPropertyImpl/summary.jelly
index f1e40fa1c068a5134949dce2fa41a976ec24f5b4..b3d23b1a44817eeab51500c60a6c1e436de0f2d5 100644
--- a/test/src/test/resources/hudson/model/UserTestCase/UserPropertyImpl/summary.jelly
+++ b/test/src/test/resources/hudson/model/UserTestCase/UserPropertyImpl/summary.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 ${it.testString}
 </j:jelly>
\ No newline at end of file
diff --git a/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly b/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly
index a011bec99d220446c034224469c1a42b3e9c21c6..dd673d0f67519f723ec88af590cdd5e094738815 100644
--- a/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly
+++ b/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <h1>TrivialTestResult body.jelly</h1>