Merge "Fix create policy without type"