Merge "AppFilterTest" into main