But I would say stick it on @FilterDef.

Because it seems to me that the setting should always be on for the tenant filter. I don’t think we would want that filter to be affected by a global setting. Which is I guess an existence proof that this is naturally a filter-level thing.