TESB-11645, policies-correlation refactoring