Merge metadata changes from upstream r729
Generated Python files for metadata
Prep for 7.0.1 release