policy refactor fixes
Merge branch 'master' of github:krzysztof-jusiak/di