Merge "Add support for multiple policy files"