Merge pull request #985 for ACL fixes