diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c905def74219..bc2e25c72ce94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add support for Azure Managed Identity in repository-azure ([#12423](https://github.com/opensearch-project/OpenSearch/issues/12423))
 - Add useCompoundFile index setting ([#13478](https://github.com/opensearch-project/OpenSearch/pull/13478))
 - Make outbound side of transport protocol dependent ([#13293](https://github.com/opensearch-project/OpenSearch/pull/13293))
+- [Remote Store] Add dynamic cluster settings to set timeout for segments upload to Remote Store ([#13679](https://github.com/opensearch-project/OpenSearch/pull/13679))
 
 ### Dependencies
 - Bump `com.github.spullara.mustache.java:compiler` from 0.9.10 to 0.9.13 ([#13329](https://github.com/opensearch-project/OpenSearch/pull/13329), [#13559](https://github.com/opensearch-project/OpenSearch/pull/13559))
diff --git a/server/src/main/java/org/opensearch/index/shard/SegmentUploadFailedException.java b/server/src/main/java/org/opensearch/index/shard/SegmentUploadFailedException.java
index 9ab13f650c14b..bbff399fb71ff 100644
--- a/server/src/main/java/org/opensearch/index/shard/SegmentUploadFailedException.java
+++ b/server/src/main/java/org/opensearch/index/shard/SegmentUploadFailedException.java
@@ -12,6 +12,8 @@
 
 /**
  * Exception to be thrown when a segment upload fails.
+ *
+ * @opensearch.internal
  */
 public class SegmentUploadFailedException extends IOException {
 
diff --git a/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java b/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
index 217b9828e60bc..bb0776e0ced25 100644
--- a/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
@@ -384,7 +384,7 @@ public void testRefreshSuccessOnSecondAttempt() throws Exception {
     }
 
     public void testSegmentUploadTimeout() throws Exception {
-        // This covers the case were segment upload fails due to timeout
+        // This covers the case where segment upload fails due to timeout
         int succeedOnAttempt = 1;
         // We spy on IndexShard.isPrimaryStarted() to validate that we have tried running remote time as per the expectation.
         CountDownLatch refreshCountLatch = new CountDownLatch(succeedOnAttempt);