Merge main's latest changes back onto dev

[josuah]

This allows to get dev up to date with main.

It might make more sense to do a rebase instead of a merge.