Merge "Fix server creation n test_large_ops"