Merge main into v1_0_5

We've got some updates that went into main instead of the new version branch. Let's bring this branch up to speed.