diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9508a3c108..aa22f5d404 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Avoid subscribes when simulcast is enabled but not currently sending, or when using server side network adaptation.
-- Made server side network adaptation the default when creating `VideoPriorityBasedPolicy`.
 
 ### Fixed
 
diff --git a/demos/browser/app/meetingV2/meetingV2.html b/demos/browser/app/meetingV2/meetingV2.html
index b5c92fb856..ab83e6c52c 100644
--- a/demos/browser/app/meetingV2/meetingV2.html
+++ b/demos/browser/app/meetingV2/meetingV2.html
@@ -212,10 +212,6 @@ <h5 class="modal-title" id="additional-options-modal-label">Additional Options</
             <input type="checkbox" id="svc" class="form-check-input">
             <label for="svc" class="form-check-label">Enable SVC for Chrome</label>
           </div>
-          <div class="form-check" style="text-align: left;">
-            <input type="checkbox" id="priority-downlink-policy" class="form-check-input">
-            <label for="priority-downlink-policy" class="form-check-label">Enable remote video quality adaptation</label>
-          </div>
           <label id="pagination-title" for="pagination-page-size" style="padding-top:5px">Paginate displayed video tiles</label>
           <select id="pagination-page-size" class="form-select" style="width:100%;">
             <option value="1">1</option>
@@ -224,6 +220,18 @@ <h5 class="modal-title" id="additional-options-modal-label">Additional Options</
             <option value="16">16</option>
             <option value="25" selected>25</option>
           </select>      
+          <div class="form-check" style="text-align: left;">
+            <input type="checkbox" id="priority-downlink-policy" class="form-check-input">
+            <label for="priority-downlink-policy" class="form-check-label">Use Priority-Based Downlink
+              Policy</label>
+          </div>
+          <label id="server-side-network-adaption-title" for="server-side-network-adaption" style="display: none; padding-top:5px">Server Side Network Adaption</label>
+          <select id="server-side-network-adaption" class="form-select" style="width:100%; display: none;">
+            <option value="default">Default</option>
+            <option value="none">None (Deprecated)</option>
+            <option value="enable-bandwidth-probing">Enable Bandwidth Probing (Deprecated)</option>
+            <option value="enable-bandwidth-probing-and-video-adaption" selected>Enable Bandwidth Probing and Video Quality Adaption</option>
+          </select>
           <div class="form-check" style="text-align: left;">
             <input type="checkbox" checked id="preconnect" class="form-check-input">
             <label for="preconnect" class="form-check-label">Open signaling connection early</label>
diff --git a/demos/browser/app/meetingV2/meetingV2.ts b/demos/browser/app/meetingV2/meetingV2.ts
index dc68d28ec0..e6b1a50ead 100644
--- a/demos/browser/app/meetingV2/meetingV2.ts
+++ b/demos/browser/app/meetingV2/meetingV2.ts
@@ -50,6 +50,7 @@ import {
   NoOpVideoFrameProcessor,
   VideoFxConfig,
   RemovableAnalyserNode,
+  ServerSideNetworkAdaption,
   SimulcastLayers,
   Transcript,
   TranscriptEvent,
@@ -62,6 +63,7 @@ import {
   VideoFrameProcessor,
   VideoInputDevice,
   VideoPriorityBasedPolicy,
+  VideoPriorityBasedPolicyConfig,
   VideoQualitySettings,
   VoiceFocusDeviceTransformer,
   VoiceFocusModelComplexity,
@@ -345,6 +347,7 @@ export class DemoMeetingApp
   enableSimulcast = false;
   enableSVC = false;
   usePriorityBasedDownlinkPolicy = false;
+  videoPriorityBasedPolicyConfig = new VideoPriorityBasedPolicyConfig;
   enablePin = false;
   echoReductionCapability = false;
   usingStereoMusicAudioProfile = false;
@@ -661,6 +664,21 @@ export class DemoMeetingApp
 
     document.getElementById('priority-downlink-policy').addEventListener('change', e => {
       this.usePriorityBasedDownlinkPolicy = (document.getElementById('priority-downlink-policy') as HTMLInputElement).checked;
+
+      const serverSideNetworkAdaption = document.getElementById(
+          'server-side-network-adaption'
+      ) as HTMLSelectElement;
+      const serverSideNetworkAdaptionTitle = document.getElementById(
+          'server-side-network-adaption-title'
+      ) as HTMLElement;
+
+      if (this.usePriorityBasedDownlinkPolicy) {
+        serverSideNetworkAdaption.style.display = 'block';
+        serverSideNetworkAdaptionTitle.style.display = 'block';
+      } else {
+        serverSideNetworkAdaption.style.display = 'none';
+        serverSideNetworkAdaptionTitle.style.display = 'none';
+      }
     });
 
     const echoReductionCheckbox = (document.getElementById('echo-reduction-checkbox') as HTMLInputElement);
@@ -1841,7 +1859,22 @@ export class DemoMeetingApp
     configuration.enableSimulcastForUnifiedPlanChromiumBasedBrowsers = this.enableSimulcast;
     configuration.enableSVC = this.enableSVC;
     if (this.usePriorityBasedDownlinkPolicy) {
-        this.priorityBasedDownlinkPolicy = new VideoPriorityBasedPolicy(this.meetingLogger);
+      const serverSideNetworkAdaptionDropDown = document.getElementById('server-side-network-adaption') as HTMLSelectElement;
+      switch (serverSideNetworkAdaptionDropDown.value) {
+        case 'default':
+          this.videoPriorityBasedPolicyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.Default;
+          break;
+        case 'none':
+          this.videoPriorityBasedPolicyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.None;
+          break;
+        case 'enable-bandwidth-probing':
+          this.videoPriorityBasedPolicyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.BandwidthProbing;
+          break;
+        case 'enable-bandwidth-probing-and-video-adaption':
+          this.videoPriorityBasedPolicyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.BandwidthProbingAndRemoteVideoQualityAdaption;
+          break;
+      }
+      this.priorityBasedDownlinkPolicy = new VideoPriorityBasedPolicy(this.meetingLogger, this.videoPriorityBasedPolicyConfig);
       configuration.videoDownlinkBandwidthPolicy = this.priorityBasedDownlinkPolicy;
       this.priorityBasedDownlinkPolicy.addObserver(this);
     } else {
diff --git a/docs/classes/videoadaptiveprobepolicy.html b/docs/classes/videoadaptiveprobepolicy.html
index cec35ddc70..40bb935147 100644
--- a/docs/classes/videoadaptiveprobepolicy.html
+++ b/docs/classes/videoadaptiveprobepolicy.html
@@ -65,14 +65,6 @@ <h1>Class VideoAdaptiveProbePolicy</h1>
 <div class="container container-main">
 	<div class="row">
 		<div class="col-8 col-content">
-			<section class="tsd-panel tsd-comment">
-				<div class="tsd-comment tsd-typography">
-					<div class="lead">
-						<p><a href="videoadaptiveprobepolicy.html">VideoAdaptiveProbePolicy</a> wraps <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a> with customized behavior to automatically
-						assign a high preference to content share.</p>
-					</div>
-				</div>
-			</section>
 			<section class="tsd-panel tsd-hierarchy">
 				<h3>Hierarchy</h3>
 				<ul class="tsd-hierarchy">
@@ -150,7 +142,7 @@ <h3>constructor</h3>
 							<aside class="tsd-sources">
 								<p>Overrides <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#constructor">constructor</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L22">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:22</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L12">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:12</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-parameters-title">Parameters</h4>
@@ -265,7 +257,7 @@ <h3>add<wbr>Observer</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#addobserver">addObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L324">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:324</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L317">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:317</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -294,7 +286,7 @@ <h3>bind<wbr>ToTile<wbr>Controller</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#bindtotilecontroller">bindToTileController</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L177">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:177</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L170">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:170</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -326,7 +318,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> calculate<wbr>Optim
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#calculateoptimalreceiveset">calculateOptimalReceiveSet</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L566">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:566</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L559">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:559</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4>
@@ -344,7 +336,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> calculate<wbr>Optim
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#calculateoptimalreceivestreams">calculateOptimalReceiveStreams</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L342">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:342</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L335">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:335</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4>
@@ -362,7 +354,7 @@ <h3>choose<wbr>Remote<wbr>Video<wbr>Sources</h3>
 							<aside class="tsd-sources">
 								<p>Overrides <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#chooseremotevideosources">chooseRemoteVideoSources</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L71">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:71</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L58">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:58</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -393,7 +385,7 @@ <h3>choose<wbr>Subscriptions</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#choosesubscriptions">chooseSubscriptions</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L306">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:306</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L299">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:299</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -420,7 +412,7 @@ <h3>for<wbr>Each<wbr>Observer</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#foreachobserver">forEachObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L332">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:332</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L325">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:325</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -468,7 +460,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> get<wbr>Current<wbr
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#getcurrentvideopreferences">getCurrentVideoPreferences</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1255">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1255</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1248">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1248</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-returns-title">Returns <a href="videopreferences.html" class="tsd-signature-type" data-tsd-kind="Class">VideoPreferences</a></h4>
@@ -486,7 +478,7 @@ <h3>get<wbr>Server<wbr>Side<wbr>Network<wbr>Adaption</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#getserversidenetworkadaption">getServerSideNetworkAdaption</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1259">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1259</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1252">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1252</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -510,7 +502,7 @@ <h3>get<wbr>Video<wbr>Preferences</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#getvideopreferences">getVideoPreferences</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1276">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1276</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1269">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1269</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -534,7 +526,7 @@ <h3>remove<wbr>Observer</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#removeobserver">removeObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L328">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:328</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L321">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:321</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -563,7 +555,7 @@ <h3>reset</h3>
 							<aside class="tsd-sources">
 								<p>Overrides <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#reset">reset</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L32">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:32</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L19">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:19</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -586,7 +578,7 @@ <h3>set<wbr>Server<wbr>Side<wbr>Network<wbr>Adaption</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#setserversidenetworkadaption">setServerSideNetworkAdaption</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1263">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1263</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1256">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1256</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -616,7 +608,7 @@ <h3>set<wbr>Video<wbr>Priority<wbr>Based<wbr>Policy<wbr>Configs</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#setvideoprioritybasedpolicyconfigs">setVideoPriorityBasedPolicyConfigs</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L338">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:338</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L331">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:331</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-parameters-title">Parameters</h4>
@@ -640,7 +632,7 @@ <h3><span class="tsd-flag ts-flagOptional">Optional</span> set<wbr>Wants<wbr>Res
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#setwantsresubscribeobserver">setWantsResubscribeObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L182">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:182</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L175">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:175</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -682,7 +674,7 @@ <h3>supported<wbr>Server<wbr>Side<wbr>Network<wbr>Adaptions</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#supportedserversidenetworkadaptions">supportedServerSideNetworkAdaptions</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1268">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1268</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1261">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1261</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -707,7 +699,7 @@ <h3>update<wbr>Index</h3>
 							<aside class="tsd-sources">
 								<p>Overrides <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#updateindex">updateIndex</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L38">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:38</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts#L25">src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts:25</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -737,7 +729,7 @@ <h3>update<wbr>Metrics</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#updatemetrics">updateMetrics</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L258">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:258</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L251">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:251</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -766,7 +758,7 @@ <h3>wants<wbr>All<wbr>Temporal<wbr>Layers<wbr>InIndex</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#wantsalltemporallayersinindex">wantsAllTemporalLayersInIndex</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1287">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1287</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1280">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1280</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -792,7 +784,7 @@ <h3>wants<wbr>Resubscribe</h3>
 							<aside class="tsd-sources">
 								<p>Inherited from <a href="videoprioritybasedpolicy.html">VideoPriorityBasedPolicy</a>.<a href="videoprioritybasedpolicy.html#wantsresubscribe">wantsResubscribe</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L290">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:290</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L283">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:283</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
diff --git a/docs/classes/videoprioritybasedpolicy.html b/docs/classes/videoprioritybasedpolicy.html
index 544666b027..69caf18399 100644
--- a/docs/classes/videoprioritybasedpolicy.html
+++ b/docs/classes/videoprioritybasedpolicy.html
@@ -257,7 +257,7 @@ <h3>add<wbr>Observer</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#addobserver">addObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L324">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:324</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L317">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:317</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -286,7 +286,7 @@ <h3>bind<wbr>ToTile<wbr>Controller</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#bindtotilecontroller">bindToTileController</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L177">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:177</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L170">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:170</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -317,7 +317,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> calculate<wbr>Optim
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L566">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:566</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L559">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:559</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4>
@@ -334,7 +334,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> calculate<wbr>Optim
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L342">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:342</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L335">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:335</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4>
@@ -351,7 +351,7 @@ <h3>choose<wbr>Remote<wbr>Video<wbr>Sources</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L189">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:189</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L182">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:182</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-parameters-title">Parameters</h4>
@@ -375,7 +375,7 @@ <h3>choose<wbr>Subscriptions</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#choosesubscriptions">chooseSubscriptions</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L306">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:306</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L299">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:299</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -402,7 +402,7 @@ <h3>for<wbr>Each<wbr>Observer</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#foreachobserver">forEachObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L332">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:332</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L325">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:325</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -449,7 +449,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> get<wbr>Current<wbr
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1255">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1255</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1248">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1248</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-returns-title">Returns <a href="videopreferences.html" class="tsd-signature-type" data-tsd-kind="Class">VideoPreferences</a></h4>
@@ -467,7 +467,7 @@ <h3>get<wbr>Server<wbr>Side<wbr>Network<wbr>Adaption</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#getserversidenetworkadaption">getServerSideNetworkAdaption</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1259">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1259</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1252">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1252</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -491,7 +491,7 @@ <h3>get<wbr>Video<wbr>Preferences</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#getvideopreferences">getVideoPreferences</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1276">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1276</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1269">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1269</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -515,7 +515,7 @@ <h3>remove<wbr>Observer</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#removeobserver">removeObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L328">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:328</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L321">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:321</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -544,7 +544,7 @@ <h3>reset</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#reset">reset</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L145">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:145</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L138">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:138</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -567,7 +567,7 @@ <h3>set<wbr>Server<wbr>Side<wbr>Network<wbr>Adaption</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#setserversidenetworkadaption">setServerSideNetworkAdaption</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1263">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1263</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1256">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1256</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -596,7 +596,7 @@ <h3>set<wbr>Video<wbr>Priority<wbr>Based<wbr>Policy<wbr>Configs</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L338">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:338</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L331">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:331</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-parameters-title">Parameters</h4>
@@ -620,7 +620,7 @@ <h3><span class="tsd-flag ts-flagOptional">Optional</span> set<wbr>Wants<wbr>Res
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#setwantsresubscribeobserver">setWantsResubscribeObserver</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L182">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:182</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L175">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:175</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -662,7 +662,7 @@ <h3>supported<wbr>Server<wbr>Side<wbr>Network<wbr>Adaptions</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#supportedserversidenetworkadaptions">supportedServerSideNetworkAdaptions</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1268">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1268</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1261">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1261</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -687,7 +687,7 @@ <h3>update<wbr>Index</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#updateindex">updateIndex</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L222">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:222</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L215">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:215</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -717,7 +717,7 @@ <h3>update<wbr>Metrics</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#updatemetrics">updateMetrics</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L258">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:258</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L251">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:251</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -746,7 +746,7 @@ <h3>wants<wbr>All<wbr>Temporal<wbr>Layers<wbr>InIndex</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#wantsalltemporallayersinindex">wantsAllTemporalLayersInIndex</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1287">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1287</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L1280">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:1280</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -772,7 +772,7 @@ <h3>wants<wbr>Resubscribe</h3>
 							<aside class="tsd-sources">
 								<p>Implementation of <a href="../interfaces/videodownlinkbandwidthpolicy.html">VideoDownlinkBandwidthPolicy</a>.<a href="../interfaces/videodownlinkbandwidthpolicy.html#wantsresubscribe">wantsResubscribe</a></p>
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L290">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:290</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts#L283">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts:283</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
diff --git a/docs/classes/videoprioritybasedpolicyconfig.html b/docs/classes/videoprioritybasedpolicyconfig.html
index 616c9997e4..38c25dccd4 100644
--- a/docs/classes/videoprioritybasedpolicyconfig.html
+++ b/docs/classes/videoprioritybasedpolicyconfig.html
@@ -122,7 +122,7 @@ <h3>constructor</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts#L33">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts:33</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts#L32">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts:32</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -185,8 +185,8 @@ <h3>server<wbr>Side<wbr>Network<wbr>Adaption</h3>
 					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p>Additional server side features to be enabled for network adaption. The only currently
-							recommended value is <code>ServerSideNetworkAdaption.BandwidthProbingAndRemoteVideoQualityAdaption</code></p>
+							<p>Additional server side features to be enabled for network adaption. This
+							may be overridden by the server. The default may be changed in future releases.</p>
 						</div>
 					</div>
 				</section>
@@ -233,7 +233,7 @@ <h3>allow<wbr>Subscribe</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts#L65">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts:65</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/main/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts#L64">src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts:64</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-parameters-title">Parameters</h4>
diff --git a/docs/enums/serversidenetworkadaption.html b/docs/enums/serversidenetworkadaption.html
index 560dad01ea..8de41e7eaf 100644
--- a/docs/enums/serversidenetworkadaption.html
+++ b/docs/enums/serversidenetworkadaption.html
@@ -139,7 +139,7 @@ <h3>Default</h3>
 					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p>This value will currently be overwritten to <code>BandwidthProbingAndRemoteVideoQualityAdaption</code></p>
+							<p>No features enabled, but this value may switch to &#39;BandwidthProbingAndRemoteVideoQualityAdaption&#39; in a later release.</p>
 						</div>
 					</div>
 				</section>
diff --git a/src/signalingclient/ServerSideNetworkAdaption.ts b/src/signalingclient/ServerSideNetworkAdaption.ts
index 577e522805..fb82f15f42 100644
--- a/src/signalingclient/ServerSideNetworkAdaption.ts
+++ b/src/signalingclient/ServerSideNetworkAdaption.ts
@@ -8,7 +8,7 @@ import { SdkServerSideNetworkAdaption } from '../signalingprotocol/SignalingProt
  */
 export enum ServerSideNetworkAdaption {
   /**
-   * This value will currently be overwritten to `BandwidthProbingAndRemoteVideoQualityAdaption`
+   * No features enabled, but this value may switch to 'BandwidthProbingAndRemoteVideoQualityAdaption' in a later release.
    */
   Default,
 
diff --git a/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts b/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts
index 8c90347663..027eed4456 100644
--- a/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts
+++ b/src/videodownlinkbandwidthpolicy/VideoAdaptiveProbePolicy.ts
@@ -3,28 +3,15 @@
 
 import ContentShareConstants from '../contentsharecontroller/ContentShareConstants';
 import Logger from '../logger/Logger';
-import ServerSideNetworkAdaption from '../signalingclient/ServerSideNetworkAdaption';
 import VideoStreamDescription from '../videostreamindex/VideoStreamDescription';
 import VideoStreamIndex from '../videostreamindex/VideoStreamIndex';
 import VideoPreference from './VideoPreference';
 import { VideoPreferences } from './VideoPreferences';
 import VideoPriorityBasedPolicy from './VideoPriorityBasedPolicy';
-import VideoPriorityBasedPolicyConfig from './VideoPriorityBasedPolicyConfig';
 
-/** [[VideoAdaptiveProbePolicy]] wraps [[VideoPriorityBasedPolicy]] with customized behavior to automatically
- * assign a high preference to content share.
- */
 export default class VideoAdaptiveProbePolicy extends VideoPriorityBasedPolicy {
-  private static createConfig(): VideoPriorityBasedPolicyConfig {
-    const config = new VideoPriorityBasedPolicyConfig();
-    config.serverSideNetworkAdaption = ServerSideNetworkAdaption.None;
-    return config;
-  }
-
   constructor(protected logger: Logger) {
-    // We use a static function to create config because Typescript requires
-    // super(...) calls to be the first line in constructors
-    super(logger, VideoAdaptiveProbePolicy.createConfig());
+    super(logger);
     super.shouldPauseTiles = false;
     this.videoPreferences = undefined;
   }
diff --git a/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts b/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts
index 18079fffce..bf3891c8fd 100644
--- a/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts
+++ b/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.ts
@@ -132,13 +132,6 @@ export default class VideoPriorityBasedPolicy implements VideoDownlinkBandwidthP
     protected logger: Logger,
     private videoPriorityBasedPolicyConfig: VideoPriorityBasedPolicyConfig = VideoPriorityBasedPolicyConfig.Default
   ) {
-    if (
-      this.videoPriorityBasedPolicyConfig.serverSideNetworkAdaption ===
-      ServerSideNetworkAdaption.Default
-    ) {
-      this.videoPriorityBasedPolicyConfig.serverSideNetworkAdaption =
-        ServerSideNetworkAdaption.BandwidthProbingAndRemoteVideoQualityAdaption;
-    }
     this.reset();
   }
 
diff --git a/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts b/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts
index 355b8da899..780d782ca0 100644
--- a/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts
+++ b/src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig.ts
@@ -26,11 +26,10 @@ export default class VideoPriorityBasedPolicyConfig {
   private referenceBitrate: number = 0;
 
   /**
-   * Additional server side features to be enabled for network adaption. The only currently
-   * recommended value is `ServerSideNetworkAdaption.BandwidthProbingAndRemoteVideoQualityAdaption`
+   * Additional server side features to be enabled for network adaption. This
+   * may be overridden by the server. The default may be changed in future releases.
    */
-  serverSideNetworkAdaption =
-    ServerSideNetworkAdaption.BandwidthProbingAndRemoteVideoQualityAdaption;
+  serverSideNetworkAdaption = ServerSideNetworkAdaption.Default;
 
   /** Initializes a [[VideoPriorityBasedPolicyConfig]] with the network event delays.
    *
diff --git a/test/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.test.ts b/test/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.test.ts
index 6898cc2495..f335efa2f2 100644
--- a/test/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.test.ts
+++ b/test/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy.test.ts
@@ -4,6 +4,7 @@
 import * as chai from 'chai';
 import * as sinon from 'sinon';
 
+import { ServerSideNetworkAdaption, VideoPriorityBasedPolicyConfig } from '../../src';
 import AudioVideoTileController from '../../src/audiovideocontroller/AudioVideoController';
 import NoOpAudioVideoTileController from '../../src/audiovideocontroller/NoOpAudioVideoController';
 import ClientMetricReport from '../../src/clientmetricreport/ClientMetricReport';
@@ -13,7 +14,6 @@ import GlobalMetricReport from '../../src/clientmetricreport/GlobalMetricReport'
 import StreamMetricReport from '../../src/clientmetricreport/StreamMetricReport';
 import ContentShareConstants from '../../src/contentsharecontroller/ContentShareConstants';
 import NoOpDebugLogger from '../../src/logger/NoOpDebugLogger';
-import ServerSideNetworkAdaption from '../../src/signalingclient/ServerSideNetworkAdaption';
 import {
   SdkBitrate,
   SdkBitrateFrame,
@@ -27,11 +27,9 @@ import VideoDownlinkObserver from '../../src/videodownlinkbandwidthpolicy/VideoD
 import VideoPreference from '../../src/videodownlinkbandwidthpolicy/VideoPreference';
 import { VideoPreferences } from '../../src/videodownlinkbandwidthpolicy/VideoPreferences';
 import VideoPriorityBasedPolicy from '../../src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicy';
-import VideoPriorityBasedPolicyConfig from '../../src/videodownlinkbandwidthpolicy/VideoPriorityBasedPolicyConfig';
 import VideoQualityAdaptationPreference from '../../src/videodownlinkbandwidthpolicy/VideoQualityAdaptationPreference';
 import SimulcastVideoStreamIndex from '../../src/videostreamindex/SimulcastVideoStreamIndex';
 import VideoTileController from '../../src/videotilecontroller/VideoTileController';
-import DOMMockBehavior from '../dommock/DOMMockBehavior';
 import DOMMockBuilder from '../dommock/DOMMockBuilder';
 
 describe('VideoPriorityBasedPolicy', () => {
@@ -43,8 +41,6 @@ describe('VideoPriorityBasedPolicy', () => {
   let audioVideoController: AudioVideoTileController;
   let tileController: VideoTileController;
 
-  let domMockBuilder: DOMMockBuilder;
-  let behavior: DOMMockBehavior;
   interface DateNow {
     (): number;
   }
@@ -304,14 +300,9 @@ describe('VideoPriorityBasedPolicy', () => {
     startTime = Date.now();
     originalDateNow = Date.now;
     Date.now = mockDateNow;
-    behavior = new DOMMockBehavior();
-    domMockBuilder = new DOMMockBuilder(behavior);
     audioVideoController = new NoOpAudioVideoTileController();
     tileController = audioVideoController.videoTileController;
-    const policyConfig = new VideoPriorityBasedPolicyConfig();
-    // Most of the tests below are for the legacy path without server side network adaptation
-    policyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.None;
-    policy = new VideoPriorityBasedPolicy(logger, policyConfig);
+    policy = new VideoPriorityBasedPolicy(logger);
     policy.bindToTileController(tileController);
     videoStreamIndex = new SimulcastVideoStreamIndex(logger);
   });
@@ -345,6 +336,7 @@ describe('VideoPriorityBasedPolicy', () => {
 
   describe('worksWithoutTileController', () => {
     it('runs without tile controller', () => {
+      const policy = new VideoPriorityBasedPolicy(logger);
       updateIndexFrame(videoStreamIndex, 6, 0, 600);
       policy.updateIndex(videoStreamIndex);
       const preferences = VideoPreferences.prepare();
@@ -359,6 +351,7 @@ describe('VideoPriorityBasedPolicy', () => {
 
   describe('default preference', () => {
     it('use default preference', () => {
+      const policy = new VideoPriorityBasedPolicy(logger);
       updateIndexFrame(videoStreamIndex, 1, 0, 1200);
       policy.updateIndex(videoStreamIndex);
       let resub = policy.wantsResubscribe();
@@ -396,9 +389,8 @@ describe('VideoPriorityBasedPolicy', () => {
     });
 
     it('use default preference with bandwidth probing', () => {
-      const config = new VideoPriorityBasedPolicyConfig();
-      config.serverSideNetworkAdaption = ServerSideNetworkAdaption.BandwidthProbing;
-      const policy = new VideoPriorityBasedPolicy(logger, config);
+      const policy = new VideoPriorityBasedPolicy(logger);
+      policy.setServerSideNetworkAdaption(ServerSideNetworkAdaption.BandwidthProbing);
 
       updateIndexFrame(videoStreamIndex, 1, 0, 1200);
       policy.updateIndex(videoStreamIndex);
@@ -437,6 +429,7 @@ describe('VideoPriorityBasedPolicy', () => {
     });
 
     it('pause tiles if not enough bandwidth for default preference', () => {
+      const policy = new VideoPriorityBasedPolicy(logger);
       policy.bindToTileController(tileController);
       updateIndexFrame(videoStreamIndex, 3, 0, 1000);
       policy.updateIndex(videoStreamIndex);
@@ -644,25 +637,6 @@ describe('VideoPriorityBasedPolicy', () => {
       const received = policy.chooseSubscriptions();
       expect(received.array()).to.deep.equal([2, 4, 6]);
     });
-
-    it('Interprets default value as BandwidthProbingAndRemoteVideoQualityAdaption', async () => {
-      const config = new VideoPriorityBasedPolicyConfig();
-      config.serverSideNetworkAdaption = ServerSideNetworkAdaption.Default;
-      const policy = new VideoPriorityBasedPolicy(logger, config);
-
-      // @ts-ignore
-      expect(policy.videoPriorityBasedPolicyConfig.serverSideNetworkAdaption).to.be.eq(
-        ServerSideNetworkAdaption.BandwidthProbingAndRemoteVideoQualityAdaption
-      );
-
-      updateIndexFrame(videoStreamIndex, 3, 0, 600);
-      policy.updateIndex(videoStreamIndex);
-
-      const resub = policy.wantsResubscribe();
-      expect(resub).to.equal(true);
-      const received = policy.chooseSubscriptions();
-      expect(received.array()).to.deep.equal([2, 4, 6]);
-    });
   });
 
   describe('getVideoPreferences', () => {
@@ -998,9 +972,7 @@ describe('VideoPriorityBasedPolicy', () => {
 
     it('Probe fail with StableNetworkPreset', () => {
       updateIndexFrame(videoStreamIndex, 4, 300, 1200);
-      const policyConfig = VideoPriorityBasedPolicyConfig.StableNetworkPreset;
-      policyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.None;
-      policy.setVideoPriorityBasedPolicyConfigs(policyConfig);
+      policy.setVideoPriorityBasedPolicyConfigs(VideoPriorityBasedPolicyConfig.StableNetworkPreset);
       policy.updateIndex(videoStreamIndex);
       const preferences = VideoPreferences.prepare();
       preferences.add(new VideoPreference('attendee-1', 2));
@@ -1098,6 +1070,7 @@ describe('VideoPriorityBasedPolicy', () => {
 
   describe('paused', () => {
     it('Tile added but not in subscribe', async () => {
+      const domMockBuilder = new DOMMockBuilder();
       const observer: VideoDownlinkObserver = {
         tileWillBePausedByDownlinkPolicy(_tileId: number) {},
         tileWillBeUnpausedByDownlinkPolicy(_tileId: number) {},
@@ -1529,9 +1502,8 @@ describe('VideoPriorityBasedPolicy', () => {
 
   describe('VideoPriorityBasedPolicyConfig', () => {
     it('will not instantly drop videos caused by dip during startup period', () => {
-      const policyConfig = VideoPriorityBasedPolicyConfig.StableNetworkPreset;
-      policyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.None;
-      policy.setVideoPriorityBasedPolicyConfigs(policyConfig);
+      const policy = new VideoPriorityBasedPolicy(logger);
+      policy.setVideoPriorityBasedPolicyConfigs(VideoPriorityBasedPolicyConfig.StableNetworkPreset);
       updateIndexFrame(videoStreamIndex, 1, 0, 1200);
       policy.updateIndex(videoStreamIndex);
       let resub = policy.wantsResubscribe();
@@ -1557,9 +1529,8 @@ describe('VideoPriorityBasedPolicy', () => {
     });
 
     it('unstable network with unstable preset', () => {
-      const policyConfig = VideoPriorityBasedPolicyConfig.UnstableNetworkPreset;
-      policyConfig.serverSideNetworkAdaption = ServerSideNetworkAdaption.None;
-      policy.setVideoPriorityBasedPolicyConfigs(policyConfig);
+      const config = VideoPriorityBasedPolicyConfig.UnstableNetworkPreset;
+      policy.setVideoPriorityBasedPolicyConfigs(config);
       updateIndexFrame(videoStreamIndex, 3, 300, 1200);
       policy.updateIndex(videoStreamIndex);
       const metricReport = new ClientMetricReport(logger);
@@ -1642,7 +1613,6 @@ describe('VideoPriorityBasedPolicy', () => {
 
     it('stable network with stable preset', () => {
       const config = VideoPriorityBasedPolicyConfig.StableNetworkPreset;
-      config.serverSideNetworkAdaption = ServerSideNetworkAdaption.None;
       policy.setVideoPriorityBasedPolicyConfigs(config);
       updateIndexFrame(videoStreamIndex, 3, 300, 1200);
       policy.updateIndex(videoStreamIndex);
@@ -1764,6 +1734,7 @@ describe('VideoPriorityBasedPolicy', () => {
     });
 
     it('works with non goog stats', () => {
+      const policy = new VideoPriorityBasedPolicy(logger);
       updateIndexFrame(videoStreamIndex, 1, 0, 1200);
       policy.updateIndex(videoStreamIndex);
       let resub = policy.wantsResubscribe();