file.copy: be smart with file changes
file.copy: be smart with file changes
Merge branch 'fix2' into develop