Merge "Correct the TunerFilter local variable naming typo" into sc-dev