Merge metadata changes from upstream r646
Generated Python files for metadata