Merge "Fix: Use super Builder class for TsFilterConfiguration"