Merge "Fix a typo when checking custom policy" into main