Merge metadata updates from upstream r562
Generated Python files for metadata