Merge "Fix external size calculations"