Refinement to agent policies
Merge pull request #1031 from shenrie/master

Refinement to agent policies