Merge branch 'main' into 'hard-cut-mass-model'

# Conflicts:
#   manifold/bin/cbc.py
1 job for hard-cut-mass-model in 4 minutes and 20 seconds (queued for 1 second)