diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
index dd3b65497f..89ae6e2a31 100755
--- a/apm-sniffer/config/agent.config
+++ b/apm-sniffer/config/agent.config
@@ -20,10 +20,6 @@ agent.namespace=${SW_AGENT_NAMESPACE:}
 # The service name in UI
 agent.service_name=${SW_AGENT_NAME:Your_ApplicationName}
 
-# Instance name is the identity of an instance, should be unique in the service. If empty, SkyWalking agent will
-# generate an 32-bit uuid. BY Default, SkyWalking uses UUID@hostname as the instance name. Max length is 50(UTF-8 char)
-agent.instance_name=${SW_AGENT_INSTANCE_NAME:}
-
 # The number of sampled traces per 3 seconds
 # Negative or zero means off, by default
 agent.sample_n_per_3_secs=${SW_AGENT_SAMPLE:-1}
@@ -31,6 +27,9 @@ agent.sample_n_per_3_secs=${SW_AGENT_SAMPLE:-1}
 # Authentication active is based on backend setting, see application.yml for more details.
 agent.authentication=${SW_AGENT_AUTHENTICATION:}
 
+# The max number of TraceSegmentRef in a single span to keep memory cost estimatable.
+agent.trace_segment_ref_limit_per_span=${SW_TRACE_SEGMENT_LIMIT:500}
+
 # The max amount of spans in a single segment.
 # Through this config item, SkyWalking keep your application memory cost estimated.
 agent.span_limit_per_segment=${SW_AGENT_SPAN_LIMIT:300}
@@ -51,6 +50,10 @@ agent.is_cache_enhanced_class=${SW_AGENT_CACHE_CLASS:false}
 # FILE: cache class bytes in `/class-cache` folder, automatically clean up cached class files when the application exits
 agent.class_cache_mode=${SW_AGENT_CLASS_CACHE_MODE:MEMORY}
 
+# Instance name is the identity of an instance, should be unique in the service. If empty, SkyWalking agent will
+# generate an 32-bit uuid. BY Default, SkyWalking uses UUID@hostname as the instance name. Max length is 50(UTF-8 char)
+agent.instance_name=${SW_AGENT_INSTANCE_NAME:}
+
 # How depth the agent goes, when log all cause exceptions.
 agent.cause_exception_depth=${SW_AGENT_CAUSE_EXCEPTION_DEPTH:5}
 
@@ -159,8 +162,8 @@ meter.active=${SW_METER_ACTIVE:true}
 meter.report_interval=${SW_METER_REPORT_INTERVAL:20}
 #  Max size of the meter pool 
 meter.max_meter_size=${SW_METER_MAX_METER_SIZE:500}
-#  Mount the specific folders of the plugins. Plugins in mounted folders would work.
 
+#  Mount the specific folders of the plugins. Plugins in mounted folders would work.
 plugin.mount=${SW_MOUNT_FOLDERS:plugins,activations}
 # Peer maximum description limit.
 plugin.peer_max_length=${SW_PLUGIN_PEER_MAX_LENGTH:200}
@@ -218,8 +221,8 @@ plugin.dubbo.collect_consumer_arguments=${SW_PLUGIN_DUBBO_COLLECT_CONSUMER_ARGUM
 plugin.dubbo.consumer_arguments_length_threshold=${SW_PLUGIN_DUBBO_CONSUMER_ARGUMENTS_LENGTH_THRESHOLD:256}
 #  Apache Dubbo provider collect `arguments` in RPC call, use `Object#toString` to collect `arguments`. 
 plugin.dubbo.collect_provider_arguments=${SW_PLUGIN_DUBBO_COLLECT_PROVIDER_ARGUMENTS:false}
-#  When `plugin.dubbo.provider_consumer_arguments` is `true`, Arguments of length from the front will to the OAP backend 
-plugin.dubbo.consumer_provider_length_threshold=${SW_PLUGIN_DUBBO_CONSUMER_PROVIDER_LENGTH_THRESHOLD:256}
+#  When `plugin.dubbo.collect_provider_arguments` is `true`, Arguments of length from the front will to the OAP backend 
+plugin.dubbo.provider_arguments_length_threshold=${SW_PLUGIN_DUBBO_PROVIDER_ARGUMENTS_LENGTH_THRESHOLD:256}
 #  A list of host/port pairs to use for establishing the initial connection to the Kafka cluster. 
 plugin.kafka.bootstrap_servers=${SW_KAFKA_BOOTSTRAP_SERVERS:localhost:9092}
 #  Timeout period of reading topics from the Kafka server, the unit is second. 
diff --git a/docs/menu.yml b/docs/menu.yml
index 8cbeb69bdd..2a4ee03ae9 100644
--- a/docs/menu.yml
+++ b/docs/menu.yml
@@ -28,14 +28,14 @@ catalog:
     catalog:
       - name: "Supported middleware, framework and library"
         path: "/en/setup/service-agent/java-agent/Supported-list"
-      - name: "Dynamic Configurations"
-        path: "/en/setup/service-agent/java-agent/configurations#dynamic-configurations"
       - name: "Optional Plugins"
         path: "/en/setup/service-agent/java-agent/readme#optional-plugins"
       - name: "Bootstrap/JVM class plugin"
         path: "/en/setup/service-agent/java-agent/readme#bootstrap-class-plugins"
       - name: "Agent Configuration Properties"
         path: "/en/setup/service-agent/java-agent/configurations#table-of-agent-configuration-properties"
+      - name: "Dynamic Configurations"
+        path: "/en/setup/service-agent/java-agent/configurations#dynamic-configurations"
       - name: "Logic Endpoint"
         path: "/en/setup/service-agent/java-agent/logic-endpoint"
       - name: "Advanced Features"