Merge main into v2

Brings the fixes that landed on main (#175 to #198, #142, #118, #151, #165, #127) into v2. The v2 code already has each of these fixes, so each conflict keeps the v2 side.

Author: pdevito3