Merge metadata changes from upstream r647
Generated Python files for metadata
Update unit tests to match latest metadata