Merge "Do the same size-configuration bucketing on both server and client" into sc-dev