Merge branch 'fix_perms_doc'