Merge pull request #2738 from alex/more-policy-constraint-bindings

More policy constraint bindings