3.3.2 patch release branch
This is the entirety of the intended changes for the patch release. We probably won't merge this MR into main, but instead just cherry-pick the desired commit.
This is the entirety of the intended changes for the patch release. We probably won't merge this MR into main, but instead just cherry-pick the desired commit.