[PATCH 4/6] Removed CCI references from Group tag and added to appropriate Rule tag.