Prep for 5.4 release
Merge metadata updates from upstream r557
Generated Python files for metadata
Merge code changes from upstream r557