Merge pull request #328 from shenrie/master

Many minor changes to policy framework to help with performance and muti-threading
Minor fix for policy interceptor