Merge pull request #668 from Tahi-project/enforce-policy-refactor

Enforce policy refactor