Closed cpsievert closed 1 month ago
Closes #4046
Merging now to unblock other PRs (also went through this fix together with @wch)
Closes #4046