Merge branch 'files-refactor' into vsolver