diff --git a/.gitignore b/.gitignore
index dc909fe4338..28f294853d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,6 +157,8 @@ FirebaseAppCheck/Apps/AppCheckCustomProvideApp/AppCheckCustomProvideApp/GoogleSe
 /Example/FirestoreSample/firebase-debug.log
 
 # generated Terraform docs
+Firestore/.terraform/*
+Firestore/.terraform.lock.hcl
 .terraform/*
 .terraform.lock.hcl
 *.tfstate
diff --git a/Firestore/Protos/nanopb/firestore/bundle.nanopb.cc b/Firestore/Protos/nanopb/firestore/bundle.nanopb.cc
index 6e15969980e..f470145f1ad 100644
--- a/Firestore/Protos/nanopb/firestore/bundle.nanopb.cc
+++ b/Firestore/Protos/nanopb/firestore/bundle.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/firestore/bundle.nanopb.h b/Firestore/Protos/nanopb/firestore/bundle.nanopb.h
index 872ea118504..bb312068857 100644
--- a/Firestore/Protos/nanopb/firestore/bundle.nanopb.h
+++ b/Firestore/Protos/nanopb/firestore/bundle.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc
index 2f906d9f95d..f145a4a81b8 100644
--- a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc
+++ b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h
index 53762bb101f..a6373161785 100644
--- a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h
+++ b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc
index 1a06d56941d..55f9a23489e 100644
--- a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc
+++ b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
index 28430465212..b316ea582b9 100644
--- a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
+++ b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc
index cd73d9344f7..7d0d51ab579 100644
--- a/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc
+++ b/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/firestore/local/target.nanopb.h b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
index 7dedb4d91eb..34f926f3ea0 100644
--- a/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
+++ b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc b/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc
index b755cad4926..c0bc8de7cdf 100644
--- a/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/api/annotations.nanopb.h b/Firestore/Protos/nanopb/google/api/annotations.nanopb.h
index 4ddc9010007..46f6d833985 100644
--- a/Firestore/Protos/nanopb/google/api/annotations.nanopb.h
+++ b/Firestore/Protos/nanopb/google/api/annotations.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/api/http.nanopb.cc b/Firestore/Protos/nanopb/google/api/http.nanopb.cc
index b69f3495d6f..6be59e2b5b8 100644
--- a/Firestore/Protos/nanopb/google/api/http.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/api/http.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/api/http.nanopb.h b/Firestore/Protos/nanopb/google/api/http.nanopb.h
index 5d97d74d221..af98141f2c4 100644
--- a/Firestore/Protos/nanopb/google/api/http.nanopb.h
+++ b/Firestore/Protos/nanopb/google/api/http.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/api/resource.nanopb.cc b/Firestore/Protos/nanopb/google/api/resource.nanopb.cc
index 82456fe0cc8..852f7122473 100644
--- a/Firestore/Protos/nanopb/google/api/resource.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/api/resource.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/api/resource.nanopb.h b/Firestore/Protos/nanopb/google/api/resource.nanopb.h
index 7c7c1ffabaa..741cc580045 100644
--- a/Firestore/Protos/nanopb/google/api/resource.nanopb.h
+++ b/Firestore/Protos/nanopb/google/api/resource.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.cc
index 5769d63aec7..acf9ce034d4 100644
--- a/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.h b/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.h
index e9ba3c9cb86..9caefad8c54 100644
--- a/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/admin/index.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.cc
index 5a740ffd8be..6b6dfe77b90 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.h
index a64f9163853..0bed00bba6d 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/v1/aggregation_result.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.cc
index 3ce3049039a..e30c4b9613f 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.h
index 0f294a9b9e1..e46bb381ada 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/v1/bloom_filter.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc
index 26c423266d4..f3b4bed3ff7 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h
index 7772c08f7df..b63ff25e66e 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc
index f236b603132..d7b202a19a8 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h
index 6a6435c05a3..05bf35cc93c 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc
index 233d2025dc9..326b3959518 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h
index 3dd603a5b09..c513fd0dfec 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc
index decd34e2ca2..ca3ce6c85d6 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h
index cac63add141..b54d343853f 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc
index d423c292d4a..1f4a31bb164 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h
index 0db9c6d2874..9fd6d1688bd 100644
--- a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h
+++ b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc
index 2a57547086a..5efdaf04dd4 100644
--- a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h
index c06c82ca2db..5a418826834 100644
--- a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h
+++ b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc
index ea00f4e2640..bc43bb31233 100644
--- a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h
index be77b64f2b7..5820d750a0d 100644
--- a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h
+++ b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc
index 1eeb1d963c8..9cc956eb61a 100644
--- a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h
index 086fabdc900..9fa79620456 100644
--- a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h
+++ b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc
index d45c5991ef4..cfa685b724e 100644
--- a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h
index a094a954fbc..d5757078e51 100644
--- a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h
+++ b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc
index e9832439ffc..a6f03ac797b 100644
--- a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h
index 7efae8dc674..98da8de2209 100644
--- a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h
+++ b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc b/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc
index b71c001f277..cf7cc2768d9 100644
--- a/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/rpc/status.nanopb.h b/Firestore/Protos/nanopb/google/rpc/status.nanopb.h
index cadd9ece3a0..bd59ff0a20e 100644
--- a/Firestore/Protos/nanopb/google/rpc/status.nanopb.h
+++ b/Firestore/Protos/nanopb/google/rpc/status.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc b/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc
index f6b9e6870e3..378c66500bf 100644
--- a/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc
+++ b/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Protos/nanopb/google/type/latlng.nanopb.h b/Firestore/Protos/nanopb/google/type/latlng.nanopb.h
index 2daf244dd19..1e78b1896ca 100644
--- a/Firestore/Protos/nanopb/google/type/latlng.nanopb.h
+++ b/Firestore/Protos/nanopb/google/type/latlng.nanopb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Firestore/Source/Public/FirebaseFirestore/FIRCallbackWrapper.h b/Firestore/Source/Public/FirebaseFirestore/FIRCallbackWrapper.h
index d5ae24f1602..68b4c2d370b 100644
--- a/Firestore/Source/Public/FirebaseFirestore/FIRCallbackWrapper.h
+++ b/Firestore/Source/Public/FirebaseFirestore/FIRCallbackWrapper.h
@@ -52,7 +52,7 @@ NS_SWIFT_NAME(CallbackWrapper)
 // are invoked on a different thread than the one they were originally defined in. If this callback
 // is expected to be called on a different thread, it should be marked as `Sendable` to ensure
 // thread safety.
-+ (std::unique_ptr<core::EventListener<std::vector<api::PipelineResult>>>)
++ (std::shared_ptr<core::EventListener<std::vector<api::PipelineResult>>>)
     wrapPipelineCallback:(std::shared_ptr<api::Firestore>)firestore
               completion:(void (^NS_SWIFT_SENDABLE)(
                              std::shared_ptr<std::vector<api::PipelineResult>> result,
diff --git a/Firestore/core/interfaceForSwift/api/pipeline.h b/Firestore/core/interfaceForSwift/api/pipeline.h
index 3a693e9880f..ff963af0efe 100644
--- a/Firestore/core/interfaceForSwift/api/pipeline.h
+++ b/Firestore/core/interfaceForSwift/api/pipeline.h
@@ -35,7 +35,7 @@ class Firestore;
 class PipelineResult;
 
 using PipelineSnapshotListener =
-    std::unique_ptr<core::EventListener<std::vector<PipelineResult>>>;
+    std::shared_ptr<core::EventListener<std::vector<PipelineResult>>>;
 
 class Pipeline {
  public: