Merge "Bug fix of BW Estimation" into sc-dev