Merge branch '2.0' into schema_api