Merge metadata changes from upstream r703
Generated Python files for metadata
Merge code changes from upstream r703
Prep for 6.3 release