Merge comment change from upstream r620
Merge metadata changes from upstreadm r620
Generated Python files for metadata