Merge "Change filter logic to allow Context Hub owners" into main