Merge metadata changes from upstream r708
Generated Python files for metadata