Merge "Fix allowlist token issues" into udc-dev