[TO_STAGE] Bugs/config perms

[merge]