diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
index a9e0aa2d3f196..d72c66ce0659d 100644
--- a/src/google/protobuf/BUILD.bazel
+++ b/src/google/protobuf/BUILD.bazel
@@ -2293,6 +2293,35 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "repeated_ptr_field_unittest",
+    srcs = ["repeated_ptr_field_unittest.cc"],
+    copts = COPTS + select({
+        "//build_defs:config_msvc": [],
+        "//conditions:default": [
+            "-Wno-deprecated-declarations",
+        ],
+    }),
+    deps = [
+        ":cc_test_protos",
+        ":internal_visibility_for_testing",
+        ":lite_test_util",
+        ":port",
+        ":protobuf",
+        ":protobuf_lite",
+        "//src/google/protobuf/io",
+        "//src/google/protobuf/stubs",
+        "//src/google/protobuf/testing",
+        "//src/google/protobuf/testing:file",
+        "@abseil-cpp//absl/base:config",
+        "@abseil-cpp//absl/log:absl_check",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/strings",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 cc_test(
     name = "text_format_unittest",
     srcs = ["text_format_unittest.cc"],
diff --git a/src/google/protobuf/repeated_ptr_field.h b/src/google/protobuf/repeated_ptr_field.h
index e29b588b7d018..79796ed0a0ffb 100644
--- a/src/google/protobuf/repeated_ptr_field.h
+++ b/src/google/protobuf/repeated_ptr_field.h
@@ -631,7 +631,7 @@ class PROTOBUF_EXPORT RepeatedPtrFieldBase {
 
   // FieldWithArena needs to call our protected internal metadata offset
   // constructors.
-  friend class internal::FieldWithArena<RepeatedPtrFieldBase>;
+  friend class internal::FieldWithArena<RepeatedPtrFieldBase>;/*  */
 
   friend google::protobuf::Arena;