Merge "Fix large file support" into release-4-5-patches