diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
index c39bfbb984a..9df1e4441a7 100755
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
@@ -128,27 +128,6 @@ public String getObject() {
     }
 
     private void addOrReplaceProperties(IModel<ContainerWrapper<C>> model, final Form form, ItemVisibilityHandler isPanelVisible, boolean isToBeReplaced){
-    	
-//    	LOGGER.info("XXXXXXXXXXXXXXX model name: " + model.getObject().getItemDefinition().getName().getLocalPart());
-//    	LOGGER.info("XXXXXXXXXXXXXXX isMultiValue: " + model.getObject().getItemDefinition().isMultiValue());
-//    	LOGGER.info("XXXXXXXXXXXXXXX values: " + model.getObject().getValues());
-//    	
-//    	if(model.getObject().getItemDefinition().isMultiValue()) {
-//    		ContainerValueWrapper<C> container = new ContainerValueWrapper<C>(model.getObject(), model.getObject().getItem().createNewValue(), model.getObject().getObjectStatus(), ValueStatus.NOT_CHANGED, model.getObject().getPath());
-//    		List<ItemWrapper> properties = new ArrayList<>();
-//    		model.getObject().getValues().forEach(item -> {
-//    			properties.add(item.getContainer());
-//    		});
-//    		container.setProperties(properties);
-//    		model = new LoadableModel<ContainerWrapper<C>>(false) {
-//    			private static final long serialVersionUID = 1L;
-//
-//    			@Override
-//    			protected ContainerWrapper<C> load() {
-//    				return container.getContainer();
-//    			}
-//    		};
-//    	}
     	ListView<ContainerValueWrapper<C>> values = new ListView<ContainerValueWrapper<C>>("values", new PropertyModel<List<ContainerValueWrapper<C>>>(model, "values")) {
 			
 			private static final long serialVersionUID = 1L;
diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties
index 259da2eadf6..b74bf44e71a 100755
--- a/infra/schema/src/main/resources/localization/schema.properties
+++ b/infra/schema/src/main/resources/localization/schema.properties
@@ -48,6 +48,8 @@ ActivityType.NOTIFICATIONS=Sending notifications
 ActivityType.PROJECTOR=Computing projections of the focus object
 ActivityType.RESOURCE_OBJECT_OPERATION=Operation on resource object
 ActivityType.WORKFLOWS=Considering or starting approval workflows
+ApplicablePoliciesType.policyGroupRef=Policy group
+AssignmentModificationPolicyConstraintType.relation=Relation
 AssignmentPolicyEnforcementType.FULL=Full
 AssignmentPolicyEnforcementType.LEGALIZE=Legalize
 AssignmentPolicyEnforcementType.MARK=Mark
@@ -139,6 +141,9 @@ CapabilitiesType.script=Script
 ChangeType.ADD=Add
 ChangeType.DELETE=Delete
 ChangeType.MODIFY=Modify
+ConflictResolutionType.action=Action
+ConflictResolutionType.maxAttempts=Max attempts
+ConflictResolutionType.delayUnit=Delay unit
 ConnectorOperationalStatus.connectorClassName=Connector class name
 ConnectorOperationalStatus.poolConfigMinSize=Minimum pool size
 ConnectorOperationalStatus.poolConfigMaxSize=Maximum pool size
@@ -163,6 +168,26 @@ FocusType.inducement=Inducements
 FocusType.delegations=Delegations
 FocusType.delegatedToMe=Delegated to me
 FocusType.displayName=Display Name
+GlobalPolicyRuleType.focusSelector=Focus selector
+GlobalPolicyRuleType.targetSelector=Target selector
+GlobalPolicyRuleType.condition=Condition
+HasAssignmentPolicyConstraintType.targetRef=Target
+HasAssignmentPolicyConstraintType.enabled=Enable
+HasAssignmentPolicyConstraintType.direct=Direct
+HasAssignmentPolicyConstraintType.relation=Relation
+LifecycleStateTransitionType.name=Name
+LifecycleStateTransitionType.description=Description
+LifecycleStateTransitionType.targetState=Target state
+LifecycleStateTransitionType.condition=Condition
+LifecycleStateType.name=Name
+LifecycleStateType.description=Description
+LifecycleStateType.displayName=Display name
+LifecycleStateType.forcedActivationStatus=Forced activation status
+LifecycleStateType.forcedAssignment=Forced assignment
+LifecycleStateType.activeAssignments=Active assignments
+LifecycleStateType.entryAction=Entry action
+LifecycleStateType.exitAction=Exit action
+LifecycleStateType.transition=Transition
 LockoutStatusType.LOCKED=Locked
 LockoutStatusType.NORMAL=Normal
 LockoutStatusType.UNDEFINED=Undefined
@@ -194,11 +219,22 @@ MappingStrengthType.STRONG=Strong
 MappingStrengthType.WEAK=Weak
 MisfireActionType.EXECUTE_IMMEDIATELY=Execute immediately
 MisfireActionType.RESCHEDULE=Reschedule
+ModificationPolicyConstraintType.operation=Operation
+ModificationPolicyConstraintType.item=Item
+ModificationPolicyConstraintType.exactPathMatch=Exactly path match
+ModificationPolicyConstraintType.expression=Expression
+MultiplicityPolicyConstraintType.multiplicity=Multiplicity
+MultiplicityPolicyConstraintType.relation=Relation
 NodeExecutionStatusType.COMMUNICATION_ERROR=Unreachable
 NodeExecutionStatusType.DOWN=Turned off
 NodeExecutionStatusType.ERROR=Error
 NodeExecutionStatusType.PAUSED=Stopped
 NodeExecutionStatusType.RUNNING=Running
+ObjectSelectorType.description=Description
+ObjectSelectorType.type=Type
+ObjectSelectorType.subtype=Subtype
+ObjectSelectorType.orgRef=Organization
+ObjectSelectorType.filter=Filter
 ObjectType.description=Description
 ObjectType.AbstractRoleType=Abstract role
 ObjectType.AccessCertificationCampaignType=Access certification campaign
@@ -281,6 +317,9 @@ AccessCertificationRemediationStyleType.REPORT_ONLY=Manual reconciliation (non-c
 PolicyConstraintEnforcementType.ENFORCE=Enforce
 PolicyConstraintEnforcementType.REMEDIATE=Remediate
 PolicyConstraintEnforcementType.REPORT=Report
+PolicyConstraintReferenceType.name=Name
+PolicySituationPolicyConstraintType.situation=Situation
+RecordPolicyActionType.policyRules=Policy rules
 ReportType.export=Export
 ReportType.orientation=Orientation
 ReportType.parent=Parent
@@ -304,6 +343,10 @@ ShadowType.synchronizationSituation=Situation
 ShadowKindType.ACCOUNT=Account
 ShadowKindType.ENTITLEMENT=Entitlement
 ShadowKindType.GENERIC=Generic
+StatePolicyConstraintType.filter=Filter
+StatePolicyConstraintType.expression=Expression
+StatePolicyConstraintType.messageExpression=Message expression
+StatePolicyConstraintType.executeScript=Execute script
 SynchronizationSituationType.DELETED=Deleted
 SynchronizationSituationType.DISPUTED=Disputed
 SynchronizationSituationType.LINKED=Linked
@@ -314,6 +357,13 @@ ThreadStopActionType.CLOSE=Close
 ThreadStopActionType.RESCHEDULE=Reschedule
 ThreadStopActionType.RESTART=Restart
 ThreadStopActionType.SUSPEND=Suspend
+TimeValidityPolicyConstraintType.item=Item
+TimeValidityPolicyConstraintType.assignment=Assignment
+TimeValidityPolicyConstraintType.activateOn=Activate on
+TimeValidityPolicyConstraintType.deactivateOn=Deactivate on
+TransitionPolicyConstraintType.stateBefore=State before
+TransitionPolicyConstraintType.stateAfter=State after
+TransitionPolicyConstraintType.constraints=Constraints
 FocusType.emailAddress=Email
 UserType.familyName=Family name
 UserType.fullName=Full name
@@ -396,6 +446,13 @@ AbstractRoleType.owner=Owner
 AbstractRoleType.approver=Approver
 AbstractRoleType.idempotent=Idempotent
 RoleType.roleType=Role Type
+ObjectPolicyConfigurationType.type=Type
+ObjectPolicyConfigurationType.subtype=Subtype
+ObjectPolicyConfigurationType.objectTemplateRef=Object policy
+ObjectPolicyConfigurationType.propertyConstraint=Property Constraint
+ObjectPolicyConfigurationType.conflictResolution=Conflict Resolution
+ObjectPolicyConfigurationType.lifecycleStateModel=Lifecycle State Model
+ObjectPolicyConfigurationType.applicablePolicies=Applicable Policies
 OrgType.type=Type
 OrgType.isTenant=Is Tenant
 OrgType.displayOrder=Display Order
@@ -404,6 +461,8 @@ OrgType.passwordPolicy=Password Policy
 ServiceType.type=Type
 ServiceType.displayOrder=Display Order
 ServiceType.URL=URL
+SystemConfigurationType.globalSecurityPolicyRef=Global security policy
+PropertyConstraintType.path=Path
 ResourceAttribute.connIdName=ConnId Name
 ResourceAttribute.connIdUID=ConnId UID
 ResourceValidator.noSchema=Resource schema is not available: {0}
@@ -575,6 +634,9 @@ PolicyConstraintsType.ref=Reference
 PolicyConstraintsType.ref.help=References another policy constraint e.g. by its name.
 ExclusionPolicyConstraintType.targetRef=Target
 ExclusionPolicyConstraintType.targetRef.help=Target of exclusion. The object defining this "exclusion" and the object defined as target cannot be assigned at the same time.
+ExclusionPolicyConstraintType.orderConstraint=Order constraint
+ExclusionPolicyConstraintType.targetOrderConstraint=Target order constraint
+ExclusionPolicyConstraintType.policy=Policy
 PolicyActionsType.enforcement=Enforcement
 PolicyActionsType.enforcement.help=This action stops the operation and results with the error.
 PolicyActionsType.approval=Approval
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
index db3721ccc0b..e20b7650236 100755
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -13670,6 +13670,7 @@
                             </xsd:documentation>
                             <xsd:appinfo>
                     			<a:objectReferenceTargetType>tns:SecurityPolicyType</a:objectReferenceTargetType>
+								<a:displayName>SystemConfigurationType.globalSecurityPolicyRef</a:displayName>
                     		</xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
@@ -14495,6 +14496,9 @@
 					<xsd:documentation>
 						Specification of the type (class) of the object to apply this definition to.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>ObjectPolicyConfigurationType.type</a:displayName>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="subtype" type="xsd:string" minOccurs="0">
@@ -14505,6 +14509,9 @@
 						The subtype is compared against the subtype property but it is also compared to the
 						deprecated employeeType, roleType, orgType and serviceType properties.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>ObjectPolicyConfigurationType.subtype</a:displayName>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="objectTemplateRef" type="tns:ObjectReferenceType">
@@ -14514,10 +14521,17 @@
 					</xsd:documentation>
 					<xsd:appinfo>
 						<a:objectReferenceTargetType>tns:ObjectTemplateType</a:objectReferenceTargetType>
+						<a:displayName>ObjectPolicyConfigurationType.objectTemplateRef</a:displayName>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="propertyConstraint" type="tns:PropertyConstraintType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<a:displayName>ObjectPolicyConfigurationType.propertyConstraint</a:displayName>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="propertyConstraint" type="tns:PropertyConstraintType" minOccurs="0" maxOccurs="unbounded"/>
 			<xsd:element name="oidNameBoundMode" type="xsd:boolean" minOccurs="0" default="false">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -14536,6 +14550,7 @@
 					<xsd:appinfo>
 						<a:since>3.6.1</a:since>
 						<a:experimental>true</a:experimental>
+						<a:displayName>ObjectPolicyConfigurationType.conflictResolution</a:displayName>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
@@ -14547,6 +14562,7 @@
 					<xsd:appinfo>
 						<a:since>3.7.1</a:since>
 						<a:experimental>true</a:experimental>
+						<a:displayName>ObjectPolicyConfigurationType.lifecycleStateModel</a:displayName>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
@@ -14561,6 +14577,7 @@
 					</xsd:documentation>
 					<xsd:appinfo>
 						<a:since>3.8</a:since>
+						<a:displayName>ObjectPolicyConfigurationType.applicablePolicies</a:displayName>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
@@ -14595,6 +14612,7 @@
 					</xsd:documentation>
 					<xsd:appinfo>
 						<a:objectReferenceTargetType>tns:OrgType</a:objectReferenceTargetType>
+						<a:displayName>ApplicablePoliciesType.policyGroupRef</a:displayName>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
@@ -14618,6 +14636,9 @@
 					<xsd:documentation>
 						What action to take.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>ConflictResolutionType.action</a:displayName>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="maxAttempts" type="xsd:int" minOccurs="0" default="1">	<!-- synchronize with Clockwork.java -->
@@ -14625,6 +14646,9 @@
 					<xsd:documentation>
 						How many attempts to undertake at most.
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>ConflictResolutionType.maxAttempts</a:displayName>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="delayUnit" type="xsd:int" minOccurs="0" default="5000">	<!-- synchronize with Clockwork.java -->
@@ -14635,6 +14659,9 @@
 						starting at 1. (In other words, the potential delay is multiplied by two after each unsuccessful
 						resolution attempt.)
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>ConflictResolutionType.delayUnit</a:displayName>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
@@ -14741,6 +14768,11 @@
 		</xsd:annotation>
 		<xsd:sequence>
 			<xsd:element name="path" type="t:ItemPathType" minOccurs="1" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<a:displayName>PropertyConstraintType.path</a:displayName>
+					</xsd:appinfo>
+				</xsd:annotation>
 			</xsd:element>
 			<!-- TODO: uniqueness constraint -->
              <xsd:element name="oidBound" type="xsd:boolean" minOccurs="0" default="false">
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
index 2871cfbd5fd..68d095334b9 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
@@ -1981,6 +1981,9 @@
                             lifecycleState property.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateType.name</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1">
@@ -1991,6 +1994,9 @@
                             Used for documentation purposes (comment).
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateType.description</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="displayName" type="xsd:string" minOccurs="0" maxOccurs="1">
@@ -2000,6 +2006,9 @@
                             User-friendly name of the state, e.g. for displaying in the user interface.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateType.displayName</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="forcedActivationStatus" type="tns:ActivationStatusType" minOccurs="0">
@@ -2028,6 +2037,7 @@
                     </xsd:documentation>
                     <xsd:appinfo>
                     	<a:since>3.8</a:since>
+						<a:displayName>LifecycleStateType.forcedActivationStatus</a:displayName>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
@@ -2038,6 +2048,7 @@
 					</xsd:documentation>
 					<xsd:appinfo>
 						<a:objectReferenceTargetType>tns:AbstractRoleType</a:objectReferenceTargetType>
+						<a:displayName>LifecycleStateType.forcedAssignment</a:displayName>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
@@ -2069,6 +2080,7 @@
                     </xsd:documentation>
                     <xsd:appinfo>
                     	<a:since>3.8</a:since>
+						<a:displayName>LifecycleStateType.activeAssignments</a:displayName>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
@@ -2080,6 +2092,9 @@
                             State entry action. Action that is executed when the state is entered.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateType.entryAction</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="exitAction" type="tns:LifecycleStateActionType" minOccurs="0" maxOccurs="unbounded">
@@ -2089,6 +2104,9 @@
                             State exit action. Action that is executed when the state is exited.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateType.exitAction</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="transition" type="tns:LifecycleStateTransitionType" minOccurs="0" maxOccurs="unbounded">
@@ -2098,6 +2116,9 @@
                             Transition to another state.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateType.transition</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
@@ -2123,6 +2144,9 @@
                             Short name for the transition. It may be used in log files, user interface, etc.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateTransitionType.name</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1">
@@ -2133,6 +2157,9 @@
                             Used for documentation purposes (comment).
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateTransitionType.description</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="targetState" type="xsd:string" minOccurs="1" maxOccurs="1">
@@ -2142,6 +2169,9 @@
                             Identifier of the state that is the target of the transition.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateTransitionType.targetState</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="condition" type="tns:ExpressionType" minOccurs="0" maxOccurs="1">
@@ -2152,6 +2182,9 @@
                             then lifecycle transitions to the target state.
                         </p>
                     </xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>LifecycleStateTransitionType.condition</a:displayName>
+					</xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>