Merge metadata updates from upstream r556
Generated Python files for metadata