Merge "Don't let allowlist override user choice" into main