Merge "Use allocation pools to prevent IP address conflicts" into mcp/epoxy