Merge metadata update fro upstream r554
Generated Python files for metadata