Merge metadata updates from upstream r550
Generated Python files for metadata
Merge code changes from upstream r550
Prepare for 5.3 release