Merge metadata updates from upstream r602
Generated Python files for metadata
Update unit test to match current metadata