Merge "Fix allowlist token issues" into sc-v2-dev