Merge branch 'feature/filemanager-improvements' into 'master'

FileManager improvements

See merge request !37
11 jobs for master in 3 minutes and 39 seconds