ARGUS-26:Fixes-to-public-API-for-policy-management