ARGUS-26: patch to improve public API for policy management