Merge metadata changes from upstream r643
Generated Python files for metadata