Minor policy interceptor and governance changes
Merge pull request #337 from shenrie/master

Minor policy interceptor and governance changes