Merge "Small improvements to matchesCallFilter functionality" into sc-v2-dev