Merge branch 'release/1.7.0' into develop
Add file resources to not limit saving to uploaded files
Merge branch 'release/1.8.0'