policy: merge branch 'th/policy-cleanup'