Index: cms/src/main/webapp/WEB-INF/web.xml
===================================================================
--- cms/src/main/webapp/WEB-INF/web.xml	(revision 55493)
+++ cms/src/main/webapp/WEB-INF/web.xml	(working copy)
@@ -19,85 +19,85 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
          version="3.0" id="hst-demosuite-cms">
 
-    <!-- General configuration -->
-    <display-name>HST Demosuite CMS</display-name>
-    <description>HST Demosuite CMS</description>
+  <!-- General configuration -->
+  <display-name>HST Demosuite CMS</display-name>
+  <description>HST Demosuite CMS</description>
 
-    <context-param>
-        <param-name>repository-address</param-name>
-        <param-value>rmi://localhost:1099/hipporepository</param-value>
-        <description>The address of the repository</description>
-    </context-param>
+  <context-param>
+    <param-name>repository-address</param-name>
+    <param-value>rmi://localhost:1099/hipporepository</param-value>
+    <description>The address of the repository</description>
+  </context-param>
 
-    <!--No concurrent logins-->
-    <filter>
-        <filter-name>ConcurrentLogin</filter-name>
-        <filter-class>org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter</filter-class>
-    </filter>
+  <!--No concurrent logins-->
+  <filter>
+    <filter-name>ConcurrentLogin</filter-name>
+    <filter-class>org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter</filter-class>
+  </filter>
 
-    <!--Default application-->
-    <filter>
-        <filter-name>CMS</filter-name>
-        <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
-        <init-param>
-            <param-name>applicationClassName</param-name>
-            <param-value>org.hippoecm.frontend.Main</param-value>
-        </init-param>
-        <init-param>
-            <param-name>filterMappingUrlPattern</param-name>
-            <param-value>/*</param-value>
-        </init-param>
-        <init-param>
-            <param-name>configuration</param-name>
-            <param-value>deployment</param-value>
-        </init-param>
-        <init-param>
-	        <param-name>repository-address</param-name>
-	        <param-value>vm://</param-value>
-		    </init-param>
-    </filter>
+  <!--Default application-->
+  <filter>
+    <filter-name>CMS</filter-name>
+    <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+    <init-param>
+      <param-name>applicationClassName</param-name>
+      <param-value>org.hippoecm.frontend.Main</param-value>
+    </init-param>
+    <init-param>
+      <param-name>filterMappingUrlPattern</param-name>
+      <param-value>/*</param-value>
+    </init-param>
+    <init-param>
+      <param-name>configuration</param-name>
+      <param-value>deployment</param-value>
+    </init-param>
+    <init-param>
+      <param-name>repository-address</param-name>
+      <param-value>vm://</param-value>
+    </init-param>
+  </filter>
 
-    <!--Builtin console-->
-    <filter>
-        <filter-name>Console</filter-name>
-        <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
-        <init-param>
-            <param-name>applicationClassName</param-name>
-            <param-value>org.hippoecm.frontend.Main</param-value>
-        </init-param>
-        <init-param>
-            <param-name>config</param-name>
-            <param-value>console</param-value>
-        </init-param>
-        <init-param>
-            <param-name>configuration</param-name>
-            <param-value>deployment</param-value>
-        </init-param>
-        <init-param>
-          <param-name>repository-address</param-name>
-          <param-value>vm://</param-value>
-        </init-param>      
-    </filter>
+  <!--Builtin console-->
+  <filter>
+    <filter-name>Console</filter-name>
+    <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+    <init-param>
+      <param-name>applicationClassName</param-name>
+      <param-value>org.hippoecm.frontend.Main</param-value>
+    </init-param>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>console</param-value>
+    </init-param>
+    <init-param>
+      <param-name>configuration</param-name>
+      <param-value>deployment</param-value>
+    </init-param>
+    <init-param>
+      <param-name>repository-address</param-name>
+      <param-value>vm://</param-value>
+    </init-param>
+  </filter>
 
-    <filter-mapping>
-        <filter-name>ConcurrentLogin</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
+  <filter-mapping>
+    <filter-name>ConcurrentLogin</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
-    <filter-mapping>
-        <filter-name>CMS</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
+  <filter-mapping>
+    <filter-name>CMS</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
-    <filter-mapping>
-        <filter-name>Console</filter-name>
-        <url-pattern>/console/*</url-pattern>
-    </filter-mapping>
-    
-    <listener>
-        <listener-class>org.hippoecm.frontend.plugins.login.ConcurrentLoginListener</listener-class>
-    </listener>
+  <filter-mapping>
+    <filter-name>Console</filter-name>
+    <url-pattern>/console/*</url-pattern>
+  </filter-mapping>
 
+  <listener>
+    <listener-class>org.hippoecm.frontend.plugins.login.ConcurrentLoginListener</listener-class>
+  </listener>
+
   <servlet>
     <servlet-name>AngularResourceServlet</servlet-name>
     <servlet-class>org.onehippo.cms7.utilities.servlet.ResourceServlet</servlet-class>
@@ -160,50 +160,52 @@
   </servlet>
 
   <servlet>
-        <servlet-name>StatusServlet</servlet-name>
-        <servlet-class>org.hippoecm.repository.StatusServlet</servlet-class>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
+    <servlet-name>StatusServlet</servlet-name>
+    <servlet-class>org.hippoecm.repository.StatusServlet</servlet-class>
+    <load-on-startup>2</load-on-startup>
+  </servlet>
 
-    <servlet>
-        <servlet-name>LoggingServlet</servlet-name>
-        <servlet-class>org.hippoecm.repository.LoggingServlet</servlet-class>
-        <load-on-startup>3</load-on-startup>
-    </servlet>
+  <servlet>
+    <servlet-name>LoggingServlet</servlet-name>
+    <servlet-class>org.hippoecm.repository.LoggingServlet</servlet-class>
+    <load-on-startup>3</load-on-startup>
+  </servlet>
 
-    <!-- Repository -->
-    <servlet>
-        <servlet-name>Repository</servlet-name>
-        <servlet-class>org.hippoecm.repository.RepositoryServlet</servlet-class>
-        <init-param>
-            <param-name>repository-directory</param-name>
-            <param-value>WEB-INF/storage</param-value>
-            <description>The (relative) location where to store files</description>
-        </init-param>
-        <init-param>
-            <param-name>repository-config</param-name>
-            <param-value>repository.xml</param-value>
-            <description>The location of the repository configuration file. Unless the location
-            starts with file://, the location is retrieved from within the application package as
-            resource.</description>
-        </init-param>
-        <load-on-startup>4</load-on-startup>
-    </servlet>
+  <!-- Repository -->
+  <servlet>
+    <servlet-name>Repository</servlet-name>
+    <servlet-class>org.hippoecm.repository.RepositoryServlet</servlet-class>
+    <init-param>
+      <param-name>repository-directory</param-name>
+      <param-value>WEB-INF/storage</param-value>
+      <description>The (relative) location where to store files</description>
+    </init-param>
+    <init-param>
+      <param-name>repository-config</param-name>
+      <param-value>repository.xml</param-value>
+      <description>
+        The location of the repository configuration file. Unless the location
+        starts with file://, the location is retrieved from within the application package as
+        resource.
+      </description>
+    </init-param>
+    <load-on-startup>4</load-on-startup>
+  </servlet>
 
-    <servlet-mapping>
-        <servlet-name>StatusServlet</servlet-name>
-        <url-pattern>/status/*</url-pattern>
-    </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>StatusServlet</servlet-name>
+    <url-pattern>/status/*</url-pattern>
+  </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>LoggingServlet</servlet-name>
-        <url-pattern>/logging/*</url-pattern>
-    </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>LoggingServlet</servlet-name>
+    <url-pattern>/logging/*</url-pattern>
+  </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>Repository</servlet-name>
-        <url-pattern>/repository/*</url-pattern>
-    </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Repository</servlet-name>
+    <url-pattern>/repository/*</url-pattern>
+  </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>AngularResourceServlet</servlet-name>
@@ -222,10 +224,9 @@
 
   <!-- Timeout in minutes -->
   <session-config>
-      <session-timeout>60</session-timeout>
+    <session-timeout>60</session-timeout>
   </session-config>
 
-
   <env-entry>
     <env-entry-name>logging/contextName</env-entry-name>
     <env-entry-type>java.lang.String</env-entry-type>
@@ -232,5 +233,4 @@
     <env-entry-value>cms</env-entry-value>
   </env-entry>
 
-
 </web-app>
Index: conf/log4j.xml
===================================================================
--- conf/log4j.xml	(revision 55493)
+++ conf/log4j.xml	(working copy)
@@ -36,6 +36,21 @@
     </filter>
   </appender>
 
+  <!-- hippo-cms-diagnostic.log -->
+  <appender name="cms-diagnostic" class="org.apache.log4j.DailyRollingFileAppender">
+    <param name="File" value="${catalina.base}/logs/hippo-cms-diagnostic.log"/>
+    <param name="Append" value="true"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%t] %m%n"/>
+    </layout>
+    <filter class="org.onehippo.cms7.logging.log4j.MdcOrJndiPropertyFilter">
+      <param name="name" value="logging/contextName" />
+      <param name="resourceRef" value="true" />
+      <param name="value" value="cms" />
+      <param name="onMatchOption" value="ACCEPT" />
+    </filter>
+  </appender>
+
   <!-- hippo-site.log -->
   <appender name="site" class="org.apache.log4j.DailyRollingFileAppender">
     <param name="File" value="${catalina.base}/logs/hippo-site.log"/>
@@ -156,6 +171,12 @@
     <level value="warn"/>
   </logger>
 
+  <logger additivity="false" name="org.hippoecm.frontend.diagnosis">
+    <level value="info"/>
+    <appender-ref ref="cms-diagnostic"/>
+    <appender-ref ref="console"/>
+  </logger>
+
   <!-- audit logging -->
   <logger additivity="false" name="org.onehippo.audit">
     <level value="info"/>
Index: pom.xml
===================================================================
--- pom.xml	(revision 55493)
+++ pom.xml	(working copy)
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-release</artifactId>
-    <version>10.0.3-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
   </parent>