Merge "enable support for large files (> 2G)"