Merge "Ensure allowlist token" into main