Merge "Add prefix matching for policy version"