GH96: ACL improvements

Reviewed and approved. Merged to master