Merge "Fix modelschema.schema_list()"