Bug 5617: policy enforcer refactor