Merge "Fix calculateSizeBytes"