Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d' * commit '3c3fc97e104bd17af608727d82e965fc28f2c89d': Better file size estimate
Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d' * commit '3c3fc97e104bd17af608727d82e965fc28f2c89d': Better file size estimate