diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/footer.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/footer.vm
index faea495eac15f2808ac22fc0b233a439d1399fc9..5202566a9d9bf7a09a0151c0dd67e23a2983c655 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/footer.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/footer.vm
@@ -6,7 +6,8 @@
     #set ($version = $xwiki.getXWikiPreference("version"))
   #end
   #if ("$!version" != "")
-    #set ($version = $xwiki.parseContent($version))
+    ## The version information coming from preferences is usually Velocity code, so make sure to evaluate it.
+    #set ($version = "#evaluate($version)")
   #else
     #set ($version = $!xwiki.version)
   #end
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/htmlheader.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/htmlheader.vm
index 1c1707e358aa8248b7895c3341c2a129e10eb68a..febdf00d5194730fa43dbfaafee07f5c0d5029f7 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/htmlheader.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/htmlheader.vm
@@ -30,7 +30,10 @@
     #if(!$title)
       #set($title = $!xwiki.getSpacePreference('title'))
       #if($title != '')
-        #set($title = "$escapetool.xml($xwiki.parseContent($title))")
+        ## Evaluate the title since it can have velocity code.
+        #set($title = "#evaluate($title)")
+        ## Don`t forget to escape it.
+        #set($title = "$escapetool.xml($title)")
       #else
         #set($title = "XWiki - $escapetool.xml($!doc.space) - $escapetool.xml($!tdoc.displayTitle)")
       #end
@@ -78,9 +81,10 @@
     ## ---------------------------------------------------------------------------------------------------------------
     <meta name="gwt:property" content="locale=$!{xcontext.language}" />
     ## ---------------------------------------------------------------------------------------------------------------
-    ## Add user-defined Meta directives
+    ## Add user-defined Meta directives.
     ## ---------------------------------------------------------------------------------------------------------------
-    $xwiki.parseContent($!xwiki.getSpacePreference("meta"))
+    ## Note: Velocity code, so it needs to be evaluated.
+    #evaluate($!xwiki.getSpacePreference("meta"))
     ## ---------------------------------------------------------------------------------------------------------------
     ## Hook for inserting Link extensions. This will be replaced with the pulled link references.
     ## ---------------------------------------------------------------------------------------------------------------
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWiki.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWiki.java
index c5710901994a0e3a2a103de20f5712bccec0b8b0..74c27857355283907b9f7b360030585a0a57e6e1 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWiki.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWiki.java
@@ -1761,6 +1761,10 @@ public <T> List<T> search(String sql, int nb, int start, Object[][] whereParams,
         return getStore().search(sql, nb, start, whereParams, context);
     }
 
+    /**
+     * @deprecated Since 7.2M1. Use specific rendering/parsing options for the content type you want to parse/render.
+     */
+    @Deprecated
     public String parseContent(String content, XWikiContext xcontext)
     {
         return getOldRendering().parseContent(content, xcontext);
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/XWiki.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/XWiki.java
index 4be79fc3de64680865376c700dbfb6e5fdc14dfd..00f911afe93877fa668e02d46fd7cfceadc63958 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/XWiki.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/XWiki.java
@@ -800,7 +800,9 @@ public List<Document> wrapDocs(List<?> docs)
      *
      * @param content
      * @return evaluated content if the content contains velocity scripts
+     * @deprecated Since 7.2M1. Use specific rendering/parsing options for the content type you want to parse/render.
      */
+    @Deprecated
     public String parseContent(String content)
     {
         return this.xwiki.parseContent(content, getXWikiContext());
diff --git a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/macros.vm b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/macros.vm
index 8e4af241a7bacb89bbd54ef54d5842edfb8f894d..bf0b28b8c4d984416ad5e11213283cb45560a463 100644
--- a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/macros.vm
+++ b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/macros.vm
@@ -190,7 +190,7 @@ $xwiki.getUserName("xwiki:${username}")
   #else
 </li>
   #end
- <li class="tocEntry"><a href="#$tocEntry.key">$!tocEntry.value.numbering $xwiki.parseContent($tocEntry.value.text)</a>
+ <li class="tocEntry"><a href="#$tocEntry.key">$!tocEntry.value.numbering #evaluate($tocEntry.value.text)</a>
   #set ($lastLevel = $level)
   #set($openeditem = true)
  #end
diff --git a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/shareinline.vm b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/shareinline.vm
index ce791dc2eb2d5484346204a602289523ff5bdb5c..674728b64b2b4dbc4e9de965228d3257532c8329 100644
--- a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/shareinline.vm
+++ b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/shareinline.vm
@@ -91,7 +91,8 @@
     #set ($fullMessage = $xwiki.getDocument('XWiki.SharePage').getObject('XWiki.Mail', 'language', $xcontext.language, true).getProperty('html').value)
     #set ($fullMessage = $fullMessage.replace('${recipientName}', $services.localization.render('core.viewers.share.recipientPlaceholder')))
     #set ($fullMessage = $fullMessage.replaceAll('<pre[^>]*+>[^<]*+</pre>', $message))
-    #set ($fullMessage = $xwiki.parseContent($fullMessage))
+    ## Evaluate the template's content since it contains Velocity code.
+    #set ($fullMessage = "#evaluate($fullMessage)")
 
     <dt><label for="message">$services.localization.render('core.viewers.share.messagePreviewLabel')</label></dt>
     <dd class='mail-preview'>$fullMessage</dd>
diff --git a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/xwikivars.vm b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/xwikivars.vm
index aed7fc2a2a37f0d9bd3de975c0e459832fdeef63..1dfcd4cbfe5e2f88bf41c6e09fb8ee91eadb5c1b 100644
--- a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/xwikivars.vm
+++ b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/xwikivars.vm
@@ -106,7 +106,7 @@
 #end
 #set ($skin = $xwiki.getSkin())
 ## Compute the copyright and evaluate its content with Velocity to allow users to put some scripts inside
-#set ($copyright = $xwiki.parseContent($xwiki.getSpaceCopyright()))
+#set ($copyright = "#evaluate($xwiki.getSpaceCopyright())")
 #set ($xwikimode = $xcontext.getMode())
 #set ($logredir = $escapetool.xml($xwiki.relativeRequestURL))
 ##