Merge "Fixes AppsFilterTest" into rvc-dev