[TASK] Adapt to recent acl changes