[PRQ#67415] Merge Request for phoenix-policies-no-sync