diff --git a/WORKSPACE b/WORKSPACE
index 0a18ada600..31e8fff61e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -335,9 +335,9 @@ http_archive(
     urls = ["https://github.com/googleapis/gax-dotnet/archive/refs/tags/%s.tar.gz" % _gax_dotnet_version],
 )
 
-_gapic_generator_csharp_version = "1.3.7"
+_gapic_generator_csharp_version = "1.3.8"
 
-_gapic_generator_csharp_sha256 = "7f4fca6f9ec3902ae0bd0e6b96593e6370fb035ef0e56dd505f5b411b7138a7a"
+_gapic_generator_csharp_sha256 = "a1ddbdfe296f8668aeba7e484c69ed0ae274bffd2b1f4c8a2ccb33aad12db707"
 
 http_archive(
     name = "gapic_generator_csharp",
diff --git a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel
index 0eb9726b6b..d26c895b4f 100644
--- a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel
@@ -298,26 +298,34 @@ csharp_grpc_library(
     deps = [":connection_csharp_proto"],
 )
 
-csharp_gapic_library(
-    name = "connection_csharp_gapic",
-    srcs = [":connection_proto_with_info"],
-    common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
-    grpc_service_config = "bigqueryconnection_grpc_service_config.json",
-    deps = [
-        ":connection_csharp_grpc",
-        ":connection_csharp_proto",
-    ],
-)
+##
+# [2021-09-17, virost] Disabled this pending investigation because
+# the pagination in the ListConnections methods plays havoc with the
+# pagination detection in the generator.
+# Likely because the type is google.protobuf.UInt32Value
+#
+# This is for v1beta1 (unpublished for C#), v1 is unaffected
+#
+# csharp_gapic_library(
+#     name = "connection_csharp_gapic",
+#     srcs = [":connection_proto_with_info"],
+#     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
+#     grpc_service_config = "bigqueryconnection_grpc_service_config.json",
+#     deps = [
+#         ":connection_csharp_grpc",
+#         ":connection_csharp_proto",
+#     ],
+# )
 
-# Open Source Packages
-csharp_gapic_assembly_pkg(
-    name = "google-cloud-bigquery-connection-v1beta1-csharp",
-    deps = [
-        ":connection_csharp_gapic",
-        ":connection_csharp_grpc",
-        ":connection_csharp_proto",
-    ],
-)
+# # Open Source Packages
+# csharp_gapic_assembly_pkg(
+#     name = "google-cloud-bigquery-connection-v1beta1-csharp",
+#     deps = [
+#         ":connection_csharp_gapic",
+#         ":connection_csharp_grpc",
+#         ":connection_csharp_proto",
+#     ],
+# )
 
 ##############################################################################
 # C++
diff --git a/google/cloud/bigquery/v2/BUILD.bazel b/google/cloud/bigquery/v2/BUILD.bazel
index 4c10ff57f3..afff84fa57 100644
--- a/google/cloud/bigquery/v2/BUILD.bazel
+++ b/google/cloud/bigquery/v2/BUILD.bazel
@@ -297,26 +297,34 @@ csharp_grpc_library(
     deps = [":bigquery_csharp_proto"],
 )
 
-csharp_gapic_library(
-    name = "bigquery_csharp_gapic",
-    srcs = [":bigquery_proto_with_info"],
-    common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
-    grpc_service_config = "bigquery_grpc_service_config.json",
-    deps = [
-        ":bigquery_csharp_grpc",
-        ":bigquery_csharp_proto",
-    ],
-)
+##
+# [2021-09-17, virost] Disabled this pending investigation because
+# the pagination in the ListModels methods plays havoc with the
+# pagination detection in the generator because the type
+# is google.protobuf.UInt32Value
+#
+# This is published, so it will be resolved with the next generator update.
+#
+# csharp_gapic_library(
+#     name = "bigquery_csharp_gapic",
+#     srcs = [":bigquery_proto_with_info"],
+#     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
+#     grpc_service_config = "bigquery_grpc_service_config.json",
+#     deps = [
+#         ":bigquery_csharp_grpc",
+#         ":bigquery_csharp_proto",
+#     ],
+# )
 
-# Open Source Packages
-csharp_gapic_assembly_pkg(
-    name = "google-cloud-bigquery-v2-csharp",
-    deps = [
-        ":bigquery_csharp_gapic",
-        ":bigquery_csharp_grpc",
-        ":bigquery_csharp_proto",
-    ],
-)
+# # Open Source Packages
+# csharp_gapic_assembly_pkg(
+#     name = "google-cloud-bigquery-v2-csharp",
+#     deps = [
+#         ":bigquery_csharp_gapic",
+#         ":bigquery_csharp_grpc",
+#         ":bigquery_csharp_proto",
+#     ],
+# )
 
 ##############################################################################
 # C++