Fixes: #2670 Simplifying ACL roles