Merge metadata updates from upstream r563
Generated Python files for metadata