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