[POLICY-117] Resolve the Policy Critical issues