Merge "Add exclusion / inclusion filter options to..." into main