Merge pull request #5165 from aparcar/fix-acl