Merge "Fix NPE when reading the allowlist" into main