make save faster
Merge remote-tracking branch 'upstream/master' into save-faster
make save faster
review changes
Merge pull request #3404 from albualexandru/save-faster

make the file save more faster on large files