Fix bug with permissions
Merge branch 'config-refactor' into cafe