Merge pull request #356 from shenrie/master

Refactored get_message_sender invocation interface
Fix for policy interceptor