Committing changes related to handling referrals on policy screen
Merge remote-tracking branch 'origin/master'