Issue #2387507: More granular permissions