Cherry pick one schema from development