Merge pull request #540 from eric-wu/develop

Merge down ACL patch from release-3