Merge "Refactor policy parsing"