Merge metadata changes from upstream r669
Generated Python files for metadata