Merge metadata updates from upstream r578
Generated Python files for metadata