Merge branch 'tb/shared-perm'