Merge "Fix Scale-up issue in HWLB"