Merge "Allow filter configurations to have NULL filterSettings" into sc-dev