Fix for OOIION-990 - Issue with policy check
Fix for OOIION-988 - Direct Access Errors - TMPSF
Merge pull request #1126 from shenrie/master

Fixes for OOIION-990 and OOIION-988