Update with some schema changes that were lost in the merge