Merge metadata changes from upstream r648
Generated Python files for metadata