Merge "schema-service processing for v19"