Merge "Add smoothing filter in BW estimator" into sc-dev