Merge `data-models-staging` into `main`

Created by: absoludity

Merge the 9 commits from data-models-staging into main (it's OK if they get a different hash here, since we're not going to continue using data-models-staging).

NOTE: don't squash and merge this, but rather we want to preserve these commits. The other option to rebase and merge is fine, since we don't need to maintain the same commit hashes now, just the commits themselves.