Merge branch 'release/1.4.0' into develop
Remove dependency injection from the file model and fix tests
Merge branch 'release/1.5.0'