Found another MetaData -> Metadata change
Merge metadata updates from upstream r590 and r593
Generated Python files for metadata