From bd963bb48dba41609eb1e357521e83b052fff7aa Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 27 Jan 2017 19:16:52 +0000
Subject: [PATCH] CCM NG/ccm-cms: Bugfixing

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4539 8810af33-2d31-482b-a856-94f89814c4df
---
 .../ContentSectionManagerTest.java            |    5 +-
 .../datasets/create_ccm_cms_schema.sql        |   60 +-
 .../after-add-contenttype.xml                 |  526 +++++++-
 .../after-add-role.xml                        |  551 +++++++-
 .../after-create.xml                          | 1143 ++++++++++++++---
 .../after-remove-contenttype.xml              |  508 +++++++-
 .../after-remove-role.xml                     |  386 +++++-
 .../after-rename.xml                          |  514 +++++++-
 .../ContentSectionManagerTest/data.xml        |  510 +++++++-
 .../src/test/resources/scripts/no-cleanup.sql |    1 +
 .../libreccm/security/PermissionManager.java  |   18 +-
 .../security/PermissionManagerTest.java       |   24 +-
 12 files changed, 3670 insertions(+), 576 deletions(-)
 create mode 100644 ccm-cms/src/test/resources/scripts/no-cleanup.sql

diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
index a41afd973..3ec7955f3 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
@@ -75,7 +75,7 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository;
 @PersistenceTest
 @Transactional(TransactionMode.COMMIT)
 @CreateSchema({"create_ccm_cms_schema.sql"})
-@CleanupUsingScript({"cleanup.sql"})
+@CleanupUsingScript({"no-cleanup.sql"})
 public class ContentSectionManagerTest {
 
     @Inject
@@ -221,7 +221,8 @@ public class ContentSectionManagerTest {
                           "section_id",
                           "creation_date",
                           "content_section_id",
-                          "folder_id"})
+                          "folder_id",
+                          "inherited_from_id"})
     @InSequence(100)
     public void createSection() {
         manager.createContentSection("test");
diff --git a/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql
index d1a6cfec4..bf80fdeba 100644
--- a/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql
+++ b/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql
@@ -857,6 +857,7 @@ create schema CCM_CORE;
         add constraint UK_goj42ghwu4tf1akfb2r6ensns unique (WORKFLOW_TEMPLATE_ID);
 
 
+
     create table CCM_CORE.APPLICATIONS (
         APPLICATION_TYPE varchar(1024) not null,
         PRIMARY_URL varchar(1024) not null,
@@ -899,7 +900,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.CATEGORY_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -916,7 +917,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.CATEGORY_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -964,7 +965,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.DOMAIN_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -981,14 +982,14 @@ create schema CCM_CORE;
 
     create table CCM_CORE.DOMAIN_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS (
         COMPONENT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (COMPONENT_ID, LOCALE)
     );
@@ -1033,14 +1034,14 @@ create schema CCM_CORE;
 
     create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS (
         DATA_QUERY_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (DATA_QUERY_ID, LOCALE)
     );
 
     create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES (
         DATA_QUERY_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (DATA_QUERY_ID, LOCALE)
     );
@@ -1077,7 +1078,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.FORMBUILDER_OPTION_LABELS (
         OPTION_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OPTION_ID, LOCALE)
     );
@@ -1090,14 +1091,14 @@ create schema CCM_CORE;
 
     create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS (
         PROCESS_LISTENER_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (PROCESS_LISTENER_ID, LOCALE)
     );
 
     create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES (
         PROCESS_LISTENER_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (PROCESS_LISTENER_ID, LOCALE)
     );
@@ -1254,6 +1255,7 @@ create schema CCM_CORE;
         CLASS_ATTRIBUTE varchar(512),
         ID_ATTRIBUTE varchar(255),
         COMPONENT_KEY varchar(255),
+        MODEL_UUID varchar(255) not null,
         STYLE_ATTRIBUTE varchar(1024),
         UUID varchar(255) not null,
         PAGE_MODEL_ID bigint,
@@ -1262,20 +1264,21 @@ create schema CCM_CORE;
 
     create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS (
         PAGE_MODEL_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (PAGE_MODEL_ID, LOCALE)
     );
 
     create table CCM_CORE.PAGE_MODEL_TITLES (
         PAGE_MODEL_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (PAGE_MODEL_ID, LOCALE)
     );
 
     create table CCM_CORE.PAGE_MODELS (
         PAGE_MODEL_ID bigint not null,
+        MODEL_UUID varchar(255) not null,
         NAME varchar(255),
         TYPE varchar(255) not null,
         UUID varchar(255) not null,
@@ -1294,9 +1297,11 @@ create schema CCM_CORE;
         PERMISSION_ID bigint not null,
         CREATION_DATE timestamp,
         CREATION_IP varchar(255),
-        granted_privilege varchar(255),
+        GRANTED_PRIVILEGE varchar(255),
+        INHERITED boolean,
         CREATION_USER_ID bigint,
         GRANTEE_ID bigint,
+        INHERITED_FROM_ID bigint,
         OBJECT_ID bigint,
         primary key (PERMISSION_ID)
     );
@@ -1329,21 +1334,21 @@ create schema CCM_CORE;
 
     create table CCM_CORE.RESOURCE_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CORE.RESOURCE_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS (
         RESOURCE_TYPE_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (RESOURCE_TYPE_ID, LOCALE)
     );
@@ -1368,7 +1373,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.ROLE_DESCRIPTIONS (
         ROLE_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (ROLE_ID, LOCALE)
     );
@@ -1385,11 +1390,11 @@ create schema CCM_CORE;
         SETTING_ID bigint not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
-        SETTING_VALUE_BOOLEAN boolean,
-        SETTING_VALUE_STRING varchar(1024),
         SETTING_VALUE_DOUBLE double,
+        SETTING_VALUE_BOOLEAN boolean,
         SETTING_VALUE_BIG_DECIMAL decimal(19,2),
         SETTING_VALUE_LONG bigint,
+        SETTING_VALUE_STRING varchar(1024),
         primary key (SETTING_ID)
     );
 
@@ -1400,7 +1405,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.SETTINGS_L10N_STR_VALUES (
         ENTRY_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (ENTRY_ID, LOCALE)
     );
@@ -1449,14 +1454,14 @@ create schema CCM_CORE;
 
     create table CCM_CORE.WORKFLOW_DESCRIPTIONS (
         WORKFLOW_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (WORKFLOW_ID, LOCALE)
     );
 
     create table CCM_CORE.WORKFLOW_NAMES (
         WORKFLOW_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (WORKFLOW_ID, LOCALE)
     );
@@ -1470,7 +1475,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.WORKFLOW_TASK_COMMENTS (
         COMMENT_ID bigint not null,
-        COMMENT longvarchar,
+        COMMENT varchar(2147483647),
         UUID varchar(255) not null,
         AUTHOR_ID bigint,
         TASK_ID bigint,
@@ -1484,14 +1489,14 @@ create schema CCM_CORE;
 
     create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS (
         TASK_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (TASK_ID, LOCALE)
     );
 
     create table CCM_CORE.WORKFLOW_TASK_LABELS (
         TASK_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (TASK_ID, LOCALE)
     );
@@ -1884,6 +1889,11 @@ create sequence hibernate_sequence start with 1 increment by 1;
         foreign key (GRANTEE_ID) 
         references CCM_CORE.CCM_ROLES;
 
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKg56ujjoe0j30pq579rf0l5yc6 
+        foreign key (INHERITED_FROM_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
     alter table CCM_CORE.PERMISSIONS 
         add constraint FKkamckexjnffnt8lay9nqeawhm 
         foreign key (OBJECT_ID) 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml
index 7d9b3aa7e..ab26c9dc9 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml
@@ -258,306 +258,708 @@
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4160"
                           granted_privilege="use_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4170"
                           granted_privilege="create_new_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4180"
                           granted_privilege="edit_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4190"
                           granted_privilege="view_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4191"
                           granted_privilege="delete_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4280" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4281" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4282" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4283" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4284" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4441" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4442" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4443" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4444" 
-                          granted_privilege="view_assets" 
+                          granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4445" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4591" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4592" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4593" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4594" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4595" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4620" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45500" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45600" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45700" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45800" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41600"
+                          granted_privilege="use_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41700"
+                          granted_privilege="create_new_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41800"
+                          granted_privilege="edit_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41900"
+                          granted_privilege="view_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41910"
+                          granted_privilege="delete_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42800" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45910" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45920" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45930" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45940" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45950" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-461000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-462000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
     <ccm_core.permissions permission_id="-4710"
                           granted_privilege="use_type"
                           object_id="-10003"
                           grantee_id="-3100"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4720"
                           granted_privilege="use_type"
                           object_id="-10003"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4730"
                           granted_privilege="use_type"
                           object_id="-10003"
                           grantee_id="-3300"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4740"
                           granted_privilege="use_type"
                           object_id="-10003"
                           grantee_id="-3400"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4750"
                           granted_privilege="use_type"
                           object_id="-10003"
                           grantee_id="-3500"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4760"
                           granted_privilege="use_type"
                           object_id="-10003"
                           grantee_id="-3600"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     
 </dataset>
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
index 384204165..76fad3d47 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
@@ -220,291 +220,712 @@
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4160"
-                              granted_privilege="use_asset"
-                              object_id="-1100"
-                              grantee_id="-3200"
-                              creation_date="2016-07-15" />
+                          granted_privilege="use_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4170"
                           granted_privilege="create_new_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4180"
                           granted_privilege="edit_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4190"
                           granted_privilege="view_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4191"
                           granted_privilege="delete_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4280" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4281" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4282" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4283" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4284" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4441" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4442" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4443" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4444" 
-                          granted_privilege="view_assets" 
+                          granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4445" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4591" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4592" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4593" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4594" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4595" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4620" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-40000" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45500" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45600" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45700" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45800" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41600"
+                          granted_privilege="use_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41700"
+                          granted_privilege="create_new_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41800"
+                          granted_privilege="edit_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41900"
+                          granted_privilege="view_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41910"
+                          granted_privilege="delete_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42800" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45910" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45920" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45930" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45940" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45950" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-461000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-462000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-400000" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3700" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41000" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-410000" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3700" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42000" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-420000" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3700" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-4000000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3700" 
+                          creation_date="2016-07-15"
+                          inherited="true" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-4100000" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3700" 
+                          creation_date="2016-07-15"
+                          inherited="true" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-4200000" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3700" 
+                          creation_date="2016-07-15"
+                          inherited="true" 
+                          inherited_from_id="-1100" />
     
 </dataset>
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
index e6f79bef9..c4c8f2f1e 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
@@ -292,553 +292,1332 @@
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4160"
                           granted_privilege="use_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4170"
                           granted_privilege="create_new_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4180"
                           granted_privilege="edit_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4190"
                           granted_privilege="view_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4191"
                           granted_privilege="delete_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4280" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4281" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4282" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4283" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4284" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4441" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4442" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4443" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4444" 
-                          granted_privilege="view_assets" 
+                          granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4445" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4591" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4592" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4593" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4594" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4595" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4620" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
-    
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45500" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45600" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45700" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45800" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41600"
+                          granted_privilege="use_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41700"
+                          granted_privilege="create_new_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41800"
+                          granted_privilege="edit_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41900"
+                          granted_privilege="view_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41910"
+                          granted_privilege="delete_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42800" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45910" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45920" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45930" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45940" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45950" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-461000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-462000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-511000" 
                           granted_privilege="categorize_items" 
                           object_id="-1200" 
                           grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41200" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-512000" 
                           granted_privilege="create_new_items" 
                           object_id="-1200" 
                           grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41300" 
+                          creation_date="2016-07-15" 
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-513000" 
                           granted_privilege="edit_items" 
                           object_id="-1200" 
                           grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41400" 
+                          creation_date="2016-07-15" 
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-514000" 
                           granted_privilege="view_published_items" 
                           object_id="-1200" 
                           grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41500" 
+                          creation_date="2016-07-15" 
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-515000" 
                           granted_privilege="preview_items" 
                           object_id="-1200" 
                           grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41600" 
-                          granted_privilege="use_asset" 
-                          object_id="-1200" 
-                          grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41610" 
-                          granted_privilege="create_new_assets" 
-                          object_id="-1200" 
-                          grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41620" 
-                          granted_privilege="edit_asset" 
-                          object_id="-1200" 
-                          grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41630" 
-                          granted_privilege="view_asset" 
-                          object_id="-1200" 
-                          grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-41640" 
-                          granted_privilege="delete_assets" 
-                          object_id="-1200" 
-                          grantee_id="-32000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42100" 
+                          creation_date="2016-07-15" 
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-516000"
+                          granted_privilege="use_asset"
+                          object_id="-1200"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15" 
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-517000"
+                          granted_privilege="create_new_assets"
+                          object_id="-1200"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-518000"
+                          granted_privilege="edit_asset"
+                          object_id="-1200"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"  
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-519000"
+                          granted_privilege="view_asset"
+                          object_id="-1200"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"  
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-519100"
+                          granted_privilege="delete_assets"
+                          object_id="-1200"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-521000" 
                           granted_privilege="categorize_items" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42200" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-522000" 
                           granted_privilege="create_new_items" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42300" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-523000" 
                           granted_privilege="edit_items" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42400" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-524000" 
                           granted_privilege="approve_items" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42500" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-525000" 
                           granted_privilege="delete_items" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42600" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-526000" 
                           granted_privilege="view_published_items" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42700" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-527000" 
                           granted_privilege="preview_items" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42810" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-528000" 
                           granted_privilege="use_asset" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42820" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-528100" 
                           granted_privilege="create_new_assets" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42830" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-528200" 
                           granted_privilege="edit_asset" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42840" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-528300" 
                           granted_privilege="view_asset" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-42850" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-528400" 
                           granted_privilege="delete_assets" 
                           object_id="-1200" 
                           grantee_id="-33000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43100" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-531000" 
                           granted_privilege="administer_roles" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43200" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-532000" 
                           granted_privilege="administer_workflow" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43300" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-533000" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43400" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-534000" 
                           granted_privilege="administer_categories" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43500" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-535000" 
                           granted_privilege="administer_content_types" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43600" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-536000" 
                           granted_privilege="categorize_items" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43700" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-537000" 
                           granted_privilege="create_new_items" 
-                          object_id="-2200" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43800" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-538000" 
                           granted_privilege="edit_items" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-43900" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-539000" 
                           granted_privilege="approve_items" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44000" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-540000" 
                           granted_privilege="publish_items" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44100" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-541000" 
                           granted_privilege="delete_items" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44200" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-542000" 
                           granted_privilege="view_published_items" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44300" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-543000" 
                           granted_privilege="preview_items" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44410" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-544100" 
                           granted_privilege="use_asset" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44420" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-544200" 
                           granted_privilege="create_new_assets" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44430" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-544300" 
                           granted_privilege="edit_asset" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44440" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-544400" 
                           granted_privilege="view_asset" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-44450" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-544500" 
                           granted_privilege="delete_assets" 
                           object_id="-1200" 
                           grantee_id="-34000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45100" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-551000" 
                           granted_privilege="categorize_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45200" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-552000" 
                           granted_privilege="create_new_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45300" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-553000" 
                           granted_privilege="edit_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45400" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-554000" 
                           granted_privilege="approve_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45500" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-555000" 
                           granted_privilege="publish_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45600" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-556000" 
                           granted_privilege="delete_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45700" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-557000" 
                           granted_privilege="view_published_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45800" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-558000" 
                           granted_privilege="preview_items" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45910" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-559100" 
                           granted_privilege="use_asset" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45920" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-559200" 
                           granted_privilege="create_new_assets" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45930" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-559300" 
                           granted_privilege="edit_asset" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45950" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-559400" 
                           granted_privilege="view_asset" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-45960" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-559500" 
                           granted_privilege="delete_assets" 
                           object_id="-1200" 
                           grantee_id="-35000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-46100" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-561000" 
                           granted_privilege="view_published_items" 
                           object_id="-1200" 
                           grantee_id="-36000" 
-                          creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="-46200" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-562000" 
                           granted_privilege="view_asset" 
                           object_id="-1200" 
                           grantee_id="-36000" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-5110000" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5120000" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5130000" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5140000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5150000" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5210000" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5220000" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5230000" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5240000" 
+                          granted_privilege="approve_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5250000" 
+                          granted_privilege="delete_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5260000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5270000" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5360000" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5370000" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5380000" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5390000" 
+                          granted_privilege="approve_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5400000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5410000" 
+                          granted_privilege="delete_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5420000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5430000" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5510000" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5520000" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5530000" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5540000" 
+                          granted_privilege="approve_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5550000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5560000" 
+                          granted_privilege="delete_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5570000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5580000" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5610000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-36000" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5160000"
+                          granted_privilege="use_asset"
+                          object_id="-2400"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5170000"
+                          granted_privilege="create_new_assets"
+                          object_id="-2400"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5180000"
+                          granted_privilege="edit_asset"
+                          object_id="-2400"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5190000"
+                          granted_privilege="view_asset"
+                          object_id="-2400"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5191000"
+                          granted_privilege="delete_assets"
+                          object_id="-2400"
+                          grantee_id="-32000"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5280000" 
+                          granted_privilege="use_asset" 
+                          object_id="-2400" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5281000" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2400" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5282000" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2400" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5283000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2400" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5284000" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2400" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5441000" 
+                          granted_privilege="use_asset" 
+                          object_id="-2400" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5442000" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2400" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5443000" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2400" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5444000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2400" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5445000" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2400" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5591000" 
+                          granted_privilege="use_asset" 
+                          object_id="-2400" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5592000" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2400" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5593000" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2400" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5594000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2400" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-5595000" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2400" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
+    <ccm_core.permissions permission_id="-56200000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2400" 
+                          grantee_id="-36000" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1200" />
 
     
 </dataset>
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml
index 31433fb83..3c1907533 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml
@@ -240,276 +240,672 @@
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4160"
                           granted_privilege="use_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4170"
                           granted_privilege="create_new_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4180"
                           granted_privilege="edit_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4190"
                           granted_privilege="view_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4191"
                           granted_privilege="delete_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>    
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4280" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4281" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4282" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4283" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4284" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4441" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4442" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4443" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4444" 
-                          granted_privilege="view_assets" 
+                          granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4445" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4591" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4592" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4593" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4594" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4595" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4620" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45500" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45600" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45700" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45800" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41600"
+                          granted_privilege="use_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41700"
+                          granted_privilege="create_new_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41800"
+                          granted_privilege="edit_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41900"
+                          granted_privilege="view_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41910"
+                          granted_privilege="delete_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42800" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45910" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45920" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45930" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45940" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45950" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-461000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-462000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
     
 </dataset>
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
index 1f40820f9..462a5ebb3 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
@@ -248,211 +248,509 @@
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4160"
                           granted_privilege="use_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4170"
                           granted_privilege="create_new_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4180"
                           granted_privilege="edit_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4190"
                           granted_privilege="view_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4191"
                           granted_privilege="delete_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
-        <ccm_core.permissions permission_id="-4280" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-4280" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4281" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4282" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4283" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4284" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4441" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4442" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4443" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4444" 
-                          granted_privilege="view_assets" 
+                          granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4445" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4620" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41600"
+                          granted_privilege="use_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41700"
+                          granted_privilege="create_new_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41800"
+                          granted_privilege="edit_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41900"
+                          granted_privilege="view_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41910"
+                          granted_privilege="delete_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42800" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-461000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-462000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
     
 </dataset>
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
index 45312feac..21afc6c0c 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
@@ -217,276 +217,672 @@
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4160"
                           granted_privilege="use_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4170"
                           granted_privilege="create_new_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4180"
                           granted_privilege="edit_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4190"
                           granted_privilege="view_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4191"
                           granted_privilege="delete_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4280" 
-                              granted_privilege="use_asset" 
-                              object_id="-1100" 
-                              grantee_id="-3300" 
-                              creation_date="2016-07-15"/>
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4281" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4282" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4283" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4284" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4441" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4442" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4443" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4444" 
-                          granted_privilege="view_assets" 
+                          granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4445" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4591" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4592" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4593" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4594" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4595" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4620" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45500" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45600" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45700" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45800" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41600"
+                          granted_privilege="use_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41700"
+                          granted_privilege="create_new_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41800"
+                          granted_privilege="edit_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41900"
+                          granted_privilege="view_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41910"
+                          granted_privilege="delete_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42800" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45910" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45920" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45930" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45940" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45950" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-461000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-462000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
     
 </dataset>
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
index 0dadfde16..8ea97c096 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
@@ -251,276 +251,672 @@
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4160"
                           granted_privilege="use_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15" 
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4170"
                           granted_privilege="create_new_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4180"
                           granted_privilege="edit_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4190"
                           granted_privilege="view_asset"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"  
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4191"
                           granted_privilege="delete_assets"
                           object_id="-1100"
                           grantee_id="-3200"
-                          creation_date="2016-07-15" />
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4280" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4281" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4282" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4283" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4284" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4441" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4442" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4443" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4444" 
-                          granted_privilege="view_assets" 
+                          granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4445" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3400" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4591" 
                           granted_privilege="use_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4592" 
                           granted_privilege="create_new_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4593" 
                           granted_privilege="edit_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4594" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4595" 
                           granted_privilege="delete_assets" 
                           object_id="-1100" 
                           grantee_id="-3500" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4620" 
                           granted_privilege="view_asset" 
                           object_id="-1100" 
                           grantee_id="-3600" 
-                          creation_date="2016-07-15"/>
-    
+                          creation_date="2016-07-15"
+                          inherited="false" />
+    <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15" 
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false"
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45500" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45600" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45700" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45800" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="false" 
+                          inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41600"
+                          granted_privilege="use_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" 
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41700"
+                          granted_privilege="create_new_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41800"
+                          granted_privilege="edit_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41900"
+                          granted_privilege="view_asset"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"  
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-41910"
+                          granted_privilege="delete_assets"
+                          object_id="-2200"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42800" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45910" 
+                          granted_privilege="use_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45920" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45930" 
+                          granted_privilege="edit_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45940" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-45950" 
+                          granted_privilege="delete_assets" 
+                          object_id="-2200" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-461000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+    <ccm_core.permissions permission_id="-462000" 
+                          granted_privilege="view_asset" 
+                          object_id="-2200" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"
+                          inherited="true" inherited_from_id="-1100" />
+
 </dataset>
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/scripts/no-cleanup.sql b/ccm-cms/src/test/resources/scripts/no-cleanup.sql
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/ccm-cms/src/test/resources/scripts/no-cleanup.sql
@@ -0,0 +1 @@
+
diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionManager.java b/ccm-core/src/main/java/org/libreccm/security/PermissionManager.java
index fd890dd78..a7eeb8f0b 100644
--- a/ccm-core/src/main/java/org/libreccm/security/PermissionManager.java
+++ b/ccm-core/src/main/java/org/libreccm/security/PermissionManager.java
@@ -123,6 +123,11 @@ public class PermissionManager {
         Arrays.stream(fields)
             .filter(field -> field.isAnnotationPresent(
             RecursivePermissions.class))
+            .filter(field -> {
+                return checkIfPrivilegeIsRecursive(
+                    field.getAnnotation(RecursivePermissions.class),
+                    privilege);
+            })
             .forEach(field -> {
                 field.setAccessible(true);
                 grantRecursive(privilege, grantee, field, object, inheritedFrom);
@@ -137,6 +142,14 @@ public class PermissionManager {
         }
     }
 
+    private boolean checkIfPrivilegeIsRecursive(
+        final RecursivePermissions annotation,
+        final String privilege) {
+
+        return Arrays.stream(annotation.privileges())
+            .anyMatch(privilege::equals);
+    }
+
     private void grantRecursive(final String privilege,
                                 final Role grantee,
                                 final Field field,
@@ -172,7 +185,10 @@ public class PermissionManager {
                                                obj,
                                                inheritedFrom));
         } else if (CcmObject.class.isAssignableFrom(field.getType())) {
-            grantPrivilege(privilege, grantee, (CcmObject) value);
+            grantInherited(privilege,
+                           grantee,
+                           (CcmObject) value,
+                           inheritedFrom);
         } else if (Relation.class.isAssignableFrom(field.getType())) {
             final Relation relation = (Relation) value;
             if (relation.getRelatedObject() != null) {
diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java
index 7451dcd06..5a8231df7 100644
--- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java
+++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java
@@ -219,7 +219,7 @@ public class PermissionManagerTest {
 
     /**
      * Verifies that permissions are granted recursivly when a permission is
-     * granted if the object has properties which are annototed with
+     * granted if the object has properties which are annotated with
      * {@link RecursivePermissions}.
      */
     @Test
@@ -239,28 +239,6 @@ public class PermissionManagerTest {
         });
     }
 
-    /**
-     * Verifies that granting a permission on a object which is already
-     * inherited from an object converts the permission to a directly granted
-     * one.
-     */
-//    @Test
-//    @UsingDataSet("datasets/org/libreccm/security/PermissionManagerTest/"
-//                      + "after-grant-recursivly.yml")
-//    @ShouldMatchDataSet(
-//        value = "datasets/org/libreccm/security/PermissionManagerTest/"
-//                    + "after-grant-inherited.yml",
-//        excludeColumns = {"permission_id"})
-//    @InSequence(212)
-//    public void grantInheritedPermission() {
-//        final Role role1 = roleRepository.findByName("role1");
-//        final CcmObject category2 = ccmObjectRepository.findById(-20002L);
-//
-//        shiro.getSystemUser().execute(() -> {
-//            permissionManager.grantPrivilege("privilege4", role1, category2);
-//        });
-//    }
-
     /**
      * Verifies that
      * {@link PermissionManager#grantPrivilege(java.lang.String, org.libreccm.security.Role)}