Tweaking builtin filters to be friendlier if null values passed in
Merge branch 'FriendlierFilters'