Merge pull request #9694 from MrPetovan/bug/9672-empty-acl-public