Merge "Policy Config Correction"