US5250 Add Entity Method availability check before context check in PreProcessFilter
US5250 Add Entity Method availability check before context check in PreProcessFilter(2)
US5250 Add Entity Method availability check before context check in PreProcessFilter(3)
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975