Merge down ACL patch from release-3