Merge "Correct the computation of the cell size." into sc-v2-dev