Merge pull request #1297 from jpereira/fix/policy1