Merge "Fix size calculation" into sc-dev