Merge "Bug fix and add metrics for BW estimator" into sc-dev