Merge "Fixes shouldFilterApplication usages" into rvc-dev