diff --git a/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml b/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml
index 50c97563ad..f30a9cb9b0 100644
--- a/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml
@@ -6,7 +6,7 @@
  <!-- Extend Imap Service -->
    <bean id="rm.imapService" abstract="true" class="org.alfresco.repo.imap.ExtendedImapServiceImpl">
       <property name="dictionaryService" ref="DictionaryService"/>
-      <property name="authenticationUtil" ref="AuthenticationUtil"/>
+      <property name="authenticationUtil" ref="rm.authenticationUtil"/>
    </bean>
    <bean class="org.alfresco.util.BeanExtender">
       <property name="beanName" value="imapService" />
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties
index 96670bb10c..227f67b3b2 100755
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties
@@ -104,7 +104,7 @@ reject.description=Hiermee wordt een record afgewezen en wordt het document naar
 reject.reason.display-label=Reden voor afwijzing
 # Request Information
 requestInfo.title=Informatie aanvragen
-requestInfo.description=Hiermee wordt een werkstroom gestart voor het aanvragen van meer informatie over een record.
+requestInfo.description=Hiermee wordt een workflow gestart voor het aanvragen van meer informatie over een record.
 # Execute script
 executeScript.title=Script uitvoeren
 executeScript.description=Hiermee wordt een script uitgevoerd.
diff --git a/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties b/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties
index cab8f8aeac..9786c3d3d1 100755
--- a/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties
+++ b/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties
@@ -4,8 +4,8 @@ activitiReviewPooled.workflow.email.subject=Informatie aangeleverd voor de recor
 activitiReviewPooled.workflow.email.body1=De gebruiker
 activitiReviewPooled.workflow.email.body2=heeft de vereiste informatie voor de record aangeleverd.
 
-rmwf_workflowmodel.type.rmwf_workflowTask.title=Werkstroomtaak
-rmwf_workflowmodel.type.rmwf_workflowTask.decription=Werkstroomtaak
+rmwf_workflowmodel.type.rmwf_workflowTask.title=Workflowtaak
+rmwf_workflowmodel.type.rmwf_workflowTask.decription=Workflowtaak
 rmwf_workflowmodel.property.rmwf_requestedInformation.title=Aangevraagde informatie
 rmwf_workflowmodel.property.rmwf_requestedInformation.decription=Aangevraagde informatie
 rmwf_workflowmodel.property.rmwf_message.title=Bericht
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
index d901b69eaf..abc6456d19 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
@@ -236,14 +236,14 @@ public class FilePlanComponentAspect extends    BaseBehaviourBean
 
                     // If the node has any renditions, they inherit the file plan from their source node.
                     List<ChildAssociationRef> renditions = renditionService.getRenditions(nodeRef);
-                    NodeRef thumbnail;
+                    NodeRef rendition;
                     for (ChildAssociationRef chAssRef : renditions)
                     {
-                        thumbnail = chAssRef.getChildRef();
-                        if (nodeService.exists(thumbnail)) 
+                        rendition = chAssRef.getChildRef();
+                        if (nodeService.exists(rendition)) 
                         {
-                            // Apply file plan component aspect to thumbnail
-                            nodeService.addAspect(thumbnail, ASPECT_FILE_PLAN_COMPONENT, null);
+                            // Apply file plan component aspect to node's renditions
+                            nodeService.addAspect(rendition, ASPECT_FILE_PLAN_COMPONENT, null);
                         }
                     }
                 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java
index 7f1bcf315b..de5bd649aa 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java
@@ -54,12 +54,19 @@ public class ExtendedImapServiceImpl extends ImapServiceImpl
         this.dictionaryService = dictionaryService;
     }
 
+    public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
+    {
+        this.authenticationUtil = authenticationUtil;
+    }
+
+    @Override
     public void setPolicyFilter(BehaviourFilter policyBehaviourFilter)
     {
         this.policyBehaviourFilter = policyBehaviourFilter;
         super.setPolicyFilter(policyBehaviourFilter);
     }
 
+    @Override
     public void setNodeService(NodeService nodeService)
     {
         this.nodeService = nodeService;