Merge "Fix allowlist token issues" into tm-dev