Merge metadata changes from upstream r650
Generated Python files for metadata
Prep for 6.0 release
Merge code changes from upstream r650