Merge "Add support for v2.37 and auto-allocated networking"