Merge "new method for policy client"