Merge metadata changes from upstream r685
Generated Python files for metadata