Merge "fix bug 184901520." into sc-dev