Merge branch 'feature/file-system-rights' into '2.x'

Feature/file system rights



See merge request !16
3 jobs for 2.x in 18 seconds