Merge in the upstream changes

* This will require a migration to be run