Merge branch 'schema-sanity'