Merge master and master-upgrade branch

This just merges the two heads that we ended up with after the recent rust upgrade. Doesn't seem to affect the build.