Merge "Fix allowlist token issues" into sc-dev