Merge ACL patch from release-3 into develop