diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/AuthPolicyPreProcessor.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/AuthPolicyPreProcessor.java
index b2a6a8bd94..b8f832d3f2 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/AuthPolicyPreProcessor.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/AuthPolicyPreProcessor.java
@@ -125,9 +125,11 @@ private void processCreatePolicy(AtlasStruct entity) throws AtlasBaseException {
             if (!POLICY_SUB_CATEGORY_DOMAIN.equals(policySubCategory)) {
                 validator.validate(policy, null, parentEntity, CREATE);
                 validateConnectionAdmin(policy);
-            } else {
-                validateAndReduce(policy);
             }
+            // TODO : uncomment after FE release
+//            else {
+//                validateAndReduce(policy);
+//            }
 
             policy.setAttribute(QUALIFIED_NAME, String.format("%s/%s", getEntityQualifiedName(parentEntity), getUUID()));
 
@@ -197,9 +199,11 @@ private void processUpdatePolicy(AtlasStruct entity, AtlasVertex vertex) throws
             if (!POLICY_SUB_CATEGORY_DOMAIN.equals(policySubCategory)) {
                 validator.validate(policy, existingPolicy, parentEntity, UPDATE);
                 validateConnectionAdmin(policy);
-            } else {
-                validateAndReduce(policy);
             }
+            // TODO : uncomment after FE release
+//            else {
+//                validateAndReduce(policy);
+//            }
 
             String qName = getEntityQualifiedName(existingPolicy);
             policy.setAttribute(QUALIFIED_NAME, qName);
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java
index 7e1c36f12d..4ece545cb8 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java
@@ -119,11 +119,13 @@ private void processCreateStakeholderTitle(AtlasEntity entity) throws AtlasBaseE
                 if (domainQualifiedNames.size() > 1) {
 
                     domainQualifiedNames.clear();
-                    domainQualifiedNames.add(NEW_STAR);
+                    // TODO : convert this to NEW_STAR after FE release
+                    domainQualifiedNames.add(STAR);
                     entity.setAttribute(ATTR_DOMAIN_QUALIFIED_NAMES, domainQualifiedNames);
-                } else {
-                    domainQualifiedNames.replaceAll(s -> s.equals(STAR) ? NEW_STAR : s);
-                }
+                } // TODO : uncomment this after FE release
+//                else {
+//                    domainQualifiedNames.replaceAll(s -> s.equals(STAR) ? NEW_STAR : s);
+//                }
 
                 String qualifiedName = format(PATTERN_QUALIFIED_NAME_ALL_DOMAINS, getUUID());
                 entity.setAttribute(QUALIFIED_NAME, qualifiedName);
@@ -214,7 +216,8 @@ private void authorizeDomainAccess(List<String> domainQualifiedNames) throws Atl
             String domainQualifiedNameToAuth;
 
             if (domainQualifiedNames.contains(STAR) || domainQualifiedNames.contains(NEW_STAR)) {
-                domainQualifiedNameToAuth = NEW_STAR;
+                //TODO : Convert this to NEW_STAR
+                domainQualifiedNameToAuth = STAR;
             } else {
                 domainQualifiedNameToAuth = domainQualifiedName;
             }