Merge metadata changes from upstream r702
Generated Python files for metadata
Merge code changes from upstream r702