Merge in Schema Changes

Note that these schema changes do not have an associated migration.