diff --git a/README.md b/README.md
index 3830e9ffe8..ffe5d3f315 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 Build status (CircleCI): [![CircleCI](https://circleci.com/gh/Dash-Industry-Forum/dash.js/tree/development.svg?style=svg)](https://circleci.com/gh/Dash-Industry-Forum/dash.js/tree/development)
 
-Join the discussion: [![Slack Status](https://dashif-slack.azurewebsites.net/badge.svg)](https://dashif-slack.azurewebsites.net)
+[Join #dashjs on Slack!](https://join.slack.com/t/dashif/shared_invite/zt-egme869x-JH~UPUuLoKJB26fw7wj3Gg)
 
 ## Overview
 A reference client implementation for the playback of MPEG DASH via JavaScript and [compliant browsers](http://caniuse.com/#feat=mediasource). Learn more about DASH IF Reference Client on our [wiki](https://github.com/Dash-Industry-Forum/dash.js/wiki).
@@ -27,15 +27,15 @@ The [nightly build of the /dev branch reference player](http://reference.dashif.
 
 
 ### CDN hosted files
-The latest minified files have been hosted on a global CDN and are free to use in production: 
+The latest minified files have been hosted on a global CDN and are free to use in production:
 
-- [dash.all.min.js](http://cdn.dashjs.org/latest/dash.all.min.js) 
-- [dash.all.debug.js](http://cdn.dashjs.org/latest/dash.all.debug.js) 
+- [dash.all.min.js](http://cdn.dashjs.org/latest/dash.all.min.js)
+- [dash.all.debug.js](http://cdn.dashjs.org/latest/dash.all.debug.js)
 
-In addition, all the releases are available under the following urls. Replace "vx.x.x" with the release version, for instance "v3.1.0". 
+In addition, all the releases are available under the following urls. Replace "vx.x.x" with the release version, for instance "v3.1.0".
 
-- [http://cdn.dashjs.org/vx.x.x/dash.all.min.js](http://cdn.dashjs.org/v3.1.0/dash.all.min.js) 
-- [http://cdn.dashjs.org/vx.x.x/dash.all.debug.js](http://cdn.dashjs.org/v3.1.0/dash.all.debug.js) 
+- [http://cdn.dashjs.org/vx.x.x/dash.all.min.js](http://cdn.dashjs.org/v3.1.0/dash.all.min.js)
+- [http://cdn.dashjs.org/vx.x.x/dash.all.debug.js](http://cdn.dashjs.org/v3.1.0/dash.all.debug.js)
 
 
 
diff --git a/contrib/akamai/controlbar/ControlBar.js b/contrib/akamai/controlbar/ControlBar.js
index b7fdbbcf7d..a22a3066e4 100644
--- a/contrib/akamai/controlbar/ControlBar.js
+++ b/contrib/akamai/controlbar/ControlBar.js
@@ -278,7 +278,7 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
         }
 
         // Get thumbnail information
-        player.getThumbnail(mouseTime, function (thumbnail) {
+        player.provideThumbnail(mouseTime, function (thumbnail) {
             if (!thumbnail) return;
 
             // Adjust left variable for positioning thumbnail with regards to its viewport
@@ -433,8 +433,10 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
         window.removeEventListener('mousemove', onFullScreenMouseMove);
         clearFullscreenState();
 
-        if (document.exitFullscreen) {
+        if (document.fullscreenElement) {
             document.exitFullscreen();
+        } else if (document.exitFullscreen) {
+           document.exitFullscreen(); 
         } else if (document.mozCancelFullScreen) {
             document.mozCancelFullScreen();
         } else if (document.msExitFullscreen) {
@@ -489,6 +491,8 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
             menuHandlersList.push(func);
             captionBtn.addEventListener('click', func);
             captionBtn.classList.remove('hide');
+        } else {
+            setMenuItemsState(e.index + 1, 'caption-list');
         }
     };
 
@@ -505,7 +509,8 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
             var availableBitrates = { menuType: 'bitrate' };
             availableBitrates.audio = player.getBitrateInfoListFor('audio') || [];
             availableBitrates.video = player.getBitrateInfoListFor('video') || [];
-            if (availableBitrates.audio.length > 1 || availableBitrates.video.length > 1) {
+            availableBitrates.images = player.getBitrateInfoListFor('image') || [];
+            if (availableBitrates.audio.length > 1 || availableBitrates.video.length > 1 || availableBitrates.images.length > 1) {
                 contentFunc = function (element, index) {
                     var result = isNaN(index) ? ' Auto Switch' : Math.floor(element.bitrate / 1000) + ' kbps';
                     result += element && element.width && element.height ? ' (' + element.width + 'x' + element.height + ')' : '';
@@ -578,6 +583,11 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
                     el = createMenuContent(el, getMenuContent(menuType, info.audio, contentFunc), 'audio', 'audio-' + menuType + '-list');
                     setMenuItemsState(getMenuInitialIndex(info.audio, menuType, 'audio'), 'audio-' + menuType + '-list');
                 }
+                if (info.images && info.images.length > 1) {
+                    el.appendChild(createMediaTypeMenu('image'));
+                    el = createMenuContent(el, getMenuContent(menuType, info.images, contentFunc, false), 'image', 'image-' + menuType + '-list');
+                    setMenuItemsState(getMenuInitialIndex(info.images, menuType, 'image'), 'image-' + menuType + '-list');
+                }
                 break;
         }
 
@@ -619,12 +629,14 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
         return (sameId && sameViewpoint && sameLang && sameRoles && sameAccessibility && sameAudioChannelConfiguration);
     };
 
-    var getMenuContent = function (type, arr, contentFunc) {
+    var getMenuContent = function (type, arr, contentFunc, autoswitch) {
+        autoswitch = (autoswitch !== undefined) ? autoswitch : true;
+
         var content = [];
         arr.forEach(function (element, index) {
             content.push(contentFunc(element, index));
         });
-        if (type !== 'track') {
+        if (type !== 'track' && autoswitch) {
             content.unshift(contentFunc(null, NaN));
         }
         return content;
@@ -655,7 +667,7 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
 
         div.id = type;
 
-        title.textContent = type === 'video' ? 'Video' : 'Audio';
+        title.textContent = type.charAt(0).toUpperCase() + type.slice(1);
         title.classList.add('menu-sub-menu-title');
 
         content.id = type + 'Content';
@@ -749,6 +761,9 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
                         player.updateSettings(cfg);
                     }
                     break;
+                case 'image-bitrate-list':
+                    player.setQualityFor(self.mediaType, self.index);
+                    break;
                 case 'caption-list':
                     player.setTextTrack(self.index - 1);
                     break;
diff --git a/index.d.ts b/index.d.ts
index 3285440a01..1a4d35d95d 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -44,7 +44,29 @@ declare namespace dashjs {
         reset(): void;
     }
 
+    export interface OfflineRecord {
+        id: string;
+        progress: number;
+        url: string;
+        originalUrl: string;
+        status: string;
+    }
+
+    interface OfflineController {
+        loadRecordsFromStorage(): Promise<void>;
+        getAllRecords(): OfflineRecord[];
+        createRecord(manifestURL: string): Promise<string>;
+        startRecord(id: string, mediaInfos: MediaInfo[]): void;
+        stopRecord(id: string): void;
+        resumeRecord(id: string): void;
+        deleteRecord(id: string): void;
+        getRecordProgression(id: string): number;
+        resetRecords(): void;
+        reset(): void;
+    }
+
     export interface Bitrate {
+        id?: string;
         width?: number;
         height?: number;
         bandwidth?: number;
@@ -195,7 +217,8 @@ declare namespace dashjs {
         on(type: ManifestLoadedEvent['type'], listener: (e: ManifestLoadedEvent) => void, scope?: object): void;
         on(type: MetricEvent['type'], listener: (e: MetricEvent) => void, scope?: object): void;
         on(type: MetricChangedEvent['type'], listener: (e: MetricChangedEvent) => void, scope?: object): void;
-        on(type: OfflineStreamEvent['type'], listener: (e: OfflineStreamEvent) => void, scope?: object): void;
+        on(type: OfflineRecordEvent['type'], listener: (e: OfflineRecordEvent) => void, scope?: object): void;
+        on(type: OfflineRecordLoademetadataEvent['type'], listener: (e: OfflineRecordLoademetadataEvent) => void, scope?: object): void;
         on(type: PeriodSwitchEvent['type'], listener: (e: PeriodSwitchEvent) => void, scope?: object): void;
         on(type: PlaybackErrorEvent['type'], listener: (e: PlaybackErrorEvent) => void, scope?: object): void;
         on(type: PlaybackPausedEvent['type'], listener: (e: PlaybackPausedEvent) => void, scope?: object): void;
@@ -260,7 +283,7 @@ declare namespace dashjs {
         setTextDefaultLanguage(lang: string): void;
         getTextDefaultEnabled(): boolean | undefined;
         setTextDefaultEnabled(enable: boolean): void;
-        getThumbnail(time: number): Thumbnail;
+        provideThumbnail(time: number, callback: (thumbnail: Thumbnail | null) => void): void;
         getBitrateInfoListFor(type: MediaType): BitrateInfo[];
         getStreamsFromManifest(manifest: object): StreamInfo[];
         getTracksFor(type: MediaType): MediaInfo[];
@@ -283,6 +306,7 @@ declare namespace dashjs {
         getProtectionController(): ProtectionController;
         attachProtectionController(value: ProtectionController): void;
         setProtectionData(value: ProtectionData): void;
+        getOfflineController(): OfflineController;
         enableManifestDateHeaderTimeSource(value: boolean): void;
         displayCaptionsOnTop(value: boolean): void;
         attachTTMLRenderingDiv(div: HTMLDivElement): void;
@@ -352,7 +376,24 @@ declare namespace dashjs {
         KEY_SYSTEM_ACCESS_DENIED_ERROR_CODE:                112;
         KEY_SESSION_CREATED_ERROR_CODE:                     113;
         MEDIA_KEY_MESSAGE_LICENSER_ERROR_CODE:              114;
+        // MSS errors
         MSS_NO_TFRF_CODE:                                   200;
+        MSS_UNSUPPORTED_CODEC_CODE:                         201;
+        // Offline errors
+        OFFLINE_ERROR:                                      11000;
+        INDEXEDDB_QUOTA_EXCEED_ERROR:                       11001;
+        INDEXEDDB_INVALID_STATE_ERROR:                      11002;
+        INDEXEDDB_NOT_READABLE_ERROR:                       11003;
+        INDEXEDDB_NOT_FOUND_ERROR:                          11004;
+        INDEXEDDB_NETWORK_ERROR:                            11005;
+        INDEXEDDB_DATA_ERROR:                               11006;
+        INDEXEDDB_TRANSACTION_INACTIVE_ERROR:               11007;
+        INDEXEDDB_NOT_ALLOWED_ERROR:                        11008;
+        INDEXEDDB_NOT_SUPPORTED_ERROR:                      11009;
+        INDEXEDDB_VERSION_ERROR:                            11010;
+        INDEXEDDB_TIMEOUT_ERROR:                            11011;
+        INDEXEDDB_ABORT_ERROR:                              11012;
+        INDEXEDDB_UNKNOWN_ERROR:                            11013;
     }
 
     interface MediaPlayerEvents {
@@ -382,6 +423,10 @@ declare namespace dashjs {
         METRIC_ADDED: 'metricAdded';
         METRIC_CHANGED: 'metricChanged';
         METRIC_UPDATED: 'metricUpdated';
+        OFFLINE_RECORD_FINISHED: 'public_offlineRecordFinished';
+        OFFLINE_RECORD_LOADEDMETADATA: 'public_offlineRecordLoadedmetadata';
+        OFFLINE_RECORD_STARTED: 'public_offlineRecordStarted';
+        OFFLINE_RECORD_STOPPED: 'public_offlineRecordStopped';
         PERIOD_SWITCH_COMPLETED: 'periodSwitchCompleted';
         PERIOD_SWITCH_STARTED: 'periodSwitchStarted';
         PLAYBACK_ENDED: 'playbackEnded';
@@ -496,6 +541,7 @@ declare namespace dashjs {
                   MediaPlayerErrors['TIMED_TEXT_ERROR_ID_PARSE_CODE'] |
                   MediaPlayerErrors['MANIFEST_ERROR_ID_MULTIPLEXED_CODE'] |
                   MediaPlayerErrors['MEDIASOURCE_TYPE_UNSUPPORTED_CODE'] |
+                  // Protection errors
                   MediaPlayerErrors['MEDIA_KEYERR_CODE'] |
                   MediaPlayerErrors['MEDIA_KEYERR_UNKNOWN_CODE'] |
                   MediaPlayerErrors['MEDIA_KEYERR_CLIENT_CODE'] |
@@ -511,9 +557,26 @@ declare namespace dashjs {
                   MediaPlayerErrors['KEY_SYSTEM_ACCESS_DENIED_ERROR_CODE'] |
                   MediaPlayerErrors['KEY_SESSION_CREATED_ERROR_CODE'] |
                   MediaPlayerErrors['MEDIA_KEY_MESSAGE_LICENSER_ERROR_CODE'] |
-                  MediaPlayerErrors['MSS_NO_TFRF_CODE'],
-            message:string,
-            data:object,
+                  // Offline errors
+                  MediaPlayerErrors['OFFLINE_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_QUOTA_EXCEED_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_INVALID_STATE_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_NOT_READABLE_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_NOT_FOUND_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_NETWORK_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_DATA_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_TRANSACTION_INACTIVE_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_NOT_ALLOWED_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_NOT_SUPPORTED_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_VERSION_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_TIMEOUT_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_ABORT_ERROR'] |
+                  MediaPlayerErrors['INDEXEDDB_UNKNOWN_ERROR'] |
+                  // MSS errors
+                  MediaPlayerErrors['MSS_NO_TFRF_CODE'] |
+                  MediaPlayerErrors['MSS_UNSUPPORTED_CODEC_CODE'],
+            message: string,
+            data: object,
         }
     }
 
@@ -621,6 +684,16 @@ declare namespace dashjs {
         mediaType: MediaType;
     }
 
+    export interface OfflineRecordEvent extends Event {
+        type: MediaPlayerEvents['OFFLINE_RECORD_FINISHED' | 'OFFLINE_RECORD_STARTED' | 'OFFLINE_RECORD_STOPPED' | 'OFFLINE_RECORD_STOPPED'];
+        id: string;
+    }
+
+    export interface OfflineRecordLoademetadataEvent extends Event {
+        type: MediaPlayerEvents['OFFLINE_RECORD_LOADEDMETADATA'];
+        madiaInfos: MediaInfo[];
+    }
+
     export interface PeriodSwitchEvent extends Event {
         type: MediaPlayerEvents['PERIOD_SWITCH_COMPLETED' | 'PERIOD_SWITCH_STARTED'];
         toStreamInfo: StreamInfo | null;
@@ -730,7 +803,7 @@ declare namespace dashjs {
     }
 
     export class BitrateInfo {
-        mediaType: 'video' | 'audio';
+        mediaType: 'video' | 'audio' | 'image';
         bitrate: number;
         width: number;
         height: number;
@@ -800,6 +873,7 @@ declare namespace dashjs {
         loadedTime: Date;
         maxFragmentDuration: number;
         minBufferTime: number;
+        protocol?: string;
     }
 
     export class StreamInfo {
@@ -807,7 +881,7 @@ declare namespace dashjs {
         index: number;
         start: number;
         duration: number;
-        manifestInfo: object;
+        manifestInfo: IManifestInfo;
         isLast: boolean;
     }
 
diff --git a/package.json b/package.json
index e7b2c65905..fffc2b755a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dashjs",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "A reference client implementation for the playback of MPEG DASH via Javascript and compliant browsers.",
   "main": "build/es5/index.js",
   "types": "build/typings/index.d.ts",
diff --git a/samples/advanced/monitoring.html b/samples/advanced/monitoring.html
index 88c73aec84..a2b3503e75 100644
--- a/samples/advanced/monitoring.html
+++ b/samples/advanced/monitoring.html
@@ -18,12 +18,12 @@
             video = document.querySelector("video");
             player = dashjs.MediaPlayer().create();
             player.initialize(video, url, true);
-            player.on(dashjs.MediaPlayer.events["PLAYBACK_ENDED"], function() {
+            player.on(dashjs.MediaPlayer.events["PLAYBACK_ENDED"], function () {
                 clearInterval(eventPoller);
                 clearInterval(bitrateCalculator);
             });
 
-            var eventPoller = setInterval(function() {
+            var eventPoller = setInterval(function () {
                 var streamInfo = player.getActiveStream().getStreamInfo();
                 var dashMetrics = player.getDashMetrics();
                 var dashAdapter = player.getDashAdapter();
@@ -33,7 +33,12 @@
                     var repSwitch = dashMetrics.getCurrentRepresentationSwitch('video', true);
                     var bufferLevel = dashMetrics.getCurrentBufferLevel('video', true);
                     var bitrate = repSwitch ? Math.round(dashAdapter.getBandwidthForRepresentation(repSwitch.to, periodIdx) / 1000) : NaN;
+                    var adaptation = dashAdapter.getAdaptationForType(periodIdx, 'video', streamInfo)
+                    var frameRate = adaptation.Representation_asArray.find(function (rep) {
+                        return rep.id === repSwitch.to
+                    }).frameRate;
                     document.getElementById('bufferLevel').innerText = bufferLevel + " secs";
+                    document.getElementById('framerate').innerText = frameRate + " fps";
                     document.getElementById('reportedBitrate').innerText = bitrate + " Kbps";
                 }
             }, 1000);
@@ -41,7 +46,7 @@
             if (video.webkitVideoDecodedByteCount !== undefined) {
                 var lastDecodedByteCount = 0;
                 const bitrateInterval = 5;
-                var bitrateCalculator = setInterval(function() {
+                var bitrateCalculator = setInterval(function () {
                     var calculatedBitrate = (((video.webkitVideoDecodedByteCount - lastDecodedByteCount) / 1000) * 8) / bitrateInterval;
                     document.getElementById('calculatedBitrate').innerText = Math.round(calculatedBitrate) + " Kbps";
                     lastDecodedByteCount = video.webkitVideoDecodedByteCount;
@@ -75,19 +80,21 @@
 <body>
 <div id="container">
     <div class="video-container">
-        <video  data-dashjs-player autoplay controls="true">
+        <video data-dashjs-player autoplay controls="true">
         </video>
     </div>
     <div>
-            <strong>Reported bitrate:</strong>
-            <span id="reportedBitrate"></span>
-            <br />
-            <strong>Buffer level:</strong>
-            <span id="bufferLevel"></span>
-            <div id="chrome-only">
-                <strong>Calculated bitrate:</strong>
-                <span id="calculatedBitrate"></span>
-            </div>
+        <strong>Reported bitrate:</strong>
+        <span id="reportedBitrate"></span>
+        <br/>
+        <strong>Buffer level:</strong>
+        <span id="bufferLevel"></span>
+        <div id="chrome-only">
+            <strong>Calculated bitrate:</strong>
+            <span id="calculatedBitrate"></span>
+        </div>
+        <strong>Framerate:</strong>
+        <span id="framerate"></span>
     </div>
 </div>
 <script>
diff --git a/samples/captioning/caption_vtt.html b/samples/captioning/caption_vtt.html
index 5744478985..a7539868d9 100644
--- a/samples/captioning/caption_vtt.html
+++ b/samples/captioning/caption_vtt.html
@@ -19,6 +19,7 @@
 
             player = dashjs.MediaPlayer({}).create();
             player.initialize(video, url, true);
+            player.setTextDefaultEnabled(true);
         }
     </script>
 
diff --git a/samples/captioning/multi-track-captions.html b/samples/captioning/multi-track-captions.html
index c559eb959e..60389b11c7 100644
--- a/samples/captioning/multi-track-captions.html
+++ b/samples/captioning/multi-track-captions.html
@@ -13,24 +13,75 @@
     <!--<script src="../../dist/dash.all.min.js"></script>-->
 
     <script class="code">
-        var EXTERNAL_CAPTION_URL = "https://dash.akamaized.net/dash264/TestCases/4b/qualcomm/1/ED_OnDemand_5SecSeg_Subtitles.mpd", // need to manually seek to get stream to start... issue with MPD but only sample with multi adaptations for external sidecar caption text xml
+        var EXTERNAL_CAPTION_URL = "https://dash.akamaized.net/dash264/TestCases/4b/qualcomm/1/ED_OnDemand_5SecSeg_Subtitles.mpd", /* need to manually seek to get stream to start... issue with MPD but only sample with multi adaptations for external sidecar caption text xml */
             FRAGMENTED_CAPTION_URL = "https://vm2.dashif.org/dash/vod/testpic_2s/multi_subs.mpd",
             videoElement,
             controlbar,
             player;
 
-        function startVideo() {
-            var url = FRAGMENTED_CAPTION_URL,
-                TTMLRenderingDiv;
-
+        function init() {
+            var TTMLRenderingDiv = document.querySelector("#ttml-rendering-div");
             videoElement = document.querySelector(".videoContainer video");
-            TTMLRenderingDiv = document.querySelector("#ttml-rendering-div");
-
             player = dashjs.MediaPlayer().create();
-            player.initialize(videoElement, url, true);
+            player.initialize(videoElement);
             player.attachTTMLRenderingDiv(TTMLRenderingDiv);
-            controlbar = new ControlBar(player); // Checkout ControlBar.js for more info on how to target/add text tracks to UI
+            player.on('currentTrackChanged', function(e) { 
+                if (e.newMediaInfo.type === 'fragmentedText') {
+                    setTimeout(showDomStorage, 0);
+                }
+            });
+            controlbar = new ControlBar(player); /* Checkout ControlBar.js for more info on how to target/add text tracks to UI */
             controlbar.initialize();
+            document.getElementById("lastMediaSettingsCachingInfoEnabled").checked = player.getSettings().streaming.lastMediaSettingsCachingInfo.enabled;
+            showDomStorage();
+        }
+
+        function showDomStorage() {
+            document.getElementById("domStorage").innerHTML = localStorage.getItem('dashjs_fragmentedText_settings');
+        }
+
+        function play() {
+            var url = FRAGMENTED_CAPTION_URL;
+            player.attachSource(url);
+            setTextDefaultEnabled();
+            setLang();
+            player.play();
+            showDomStorage();
+        }
+
+        function setTextDefaultEnabled() {
+            var checkbox = document.getElementById("textDefaultEnabled");
+            player.setTextDefaultEnabled(checkbox.checked);
+        }
+
+        function setLang() {
+            var lang = document.getElementById("textSettings").value;
+            var role = null;
+            if (lang) {
+                if (lang.indexOf('-') != -1) {
+                    var values = lang.split('-');
+                    lang = values[0];
+                    role = values[1];
+                }
+                player.setInitialMediaSettingsFor('fragmentedText', { 
+                    lang: lang,
+                    role: role
+                });
+            }
+        }
+
+        function setLastMediaSettingsCachingInfoEnabled() {
+            var checkbox = document.getElementById("lastMediaSettingsCachingInfoEnabled");
+            player.updateSettings({
+                streaming: {
+                    lastMediaSettingsCachingInfo: { enabled: checkbox.checked }
+                }
+            })
+        }
+
+        function clearDomStorage() {
+            localStorage.removeItem('dashjs_fragmentedText_settings');
+            showDomStorage();
         }
 
     </script>
@@ -43,12 +94,24 @@
         .dash-video-player {
             width: 640px;
         }
+
+        .settings {
+            clear: both;
+        }
+        .settings>div {
+            padding: 5px 0;
+        }
+
+        label {
+            font-size: 1.1em;
+        }
+
     </style>
 
-    <body onload="startVideo()">
+    <body onload="init()">
         <div class="dash-video-player code">
             <div class="videoContainer" id="videoContainer">
-                <video preload="auto" autoplay="true" > </video>
+                <video preload="auto"> </video>
                 <div id="ttml-rendering-div"></div>
 
                 <div id="videoController" class="video-controller unselectable">
@@ -81,6 +144,35 @@
                     </div>
                 </div>
             </div>
+            <div class="settings">
+                <div>
+                    <button onclick="play()">play</button>
+                </div>
+                <div>
+                    <input type="checkbox" id="textDefaultEnabled" onchange="setTextDefaultEnabled()" checked>
+                    <label>textDefaultEnabled</label>
+                </div>
+                <div>
+                    <label>initial settings Language/Role </label>
+                    <select onchange="setLang()" id="textSettings">
+                        <option value="">-- unset initial lang and role --</option>
+                        <option value="eng-subtitle">eng - subtitles</option>
+                        <option value="eng-caption">eng - captions</option>
+                        <option value="swe">swe - subtitles</option>
+                        <option value="qbb">qbb - subtitles</option>
+                        <option value="nor">nor - subtitles</option>
+                    </select>
+                </div>
+                <div>
+                    <input type="checkbox" id="lastMediaSettingsCachingInfoEnabled" onchange="setLastMediaSettingsCachingInfoEnabled()"/>
+                    <label>streaming.lastMediaSettingsCachingInfo.enabled</label>
+                </div>
+                <div>
+                    <label>localStorage content</label>
+                    <div id="domStorage"></div>
+                    <button onclick="clearDomStorage()">Clear localStorage</button>
+                </div>
+            </div>
         </div>
         <script src="../highlighter.js"></script>
     </body>
diff --git a/samples/captioning/ttml-ebutt-sample.html b/samples/captioning/ttml-ebutt-sample.html
index 388b4df1f5..f80f371699 100644
--- a/samples/captioning/ttml-ebutt-sample.html
+++ b/samples/captioning/ttml-ebutt-sample.html
@@ -33,6 +33,7 @@
 
             player = dashjs.MediaPlayer().create();
             player.initialize(videoElement, url, true);
+            player.setTextDefaultEnabled(true);
             player.attachTTMLRenderingDiv(TTMLRenderingDiv);
             controlbar = new ControlBar(player); // Checkout ControlBar.js for more info on how to target/add text tracks to UI
             controlbar.initialize();
diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 6a5c784455..f19dd036b8 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -57,6 +57,18 @@ app.controller('DashController', function ($scope, sources, contributors, dashif
                 submenu: data.items
             });
         });
+
+        // Add provider to beginning of each Vector
+        var provider = data.provider;
+        $scope.availableStreams.forEach(function (item) {
+            if(item && item.submenu && item.submenu.length > 0) {
+                item.submenu.forEach(function (subitem) {
+                   if(subitem && subitem.name && subitem.provider && provider[subitem.provider] && provider[subitem.provider].acronym) {
+                       subitem.name = '[' + provider[subitem.provider].acronym + '] ' + subitem.name;
+                   }
+                });
+            }
+        });
     });
 
     contributors.query(function (data) {
@@ -240,6 +252,7 @@ app.controller('DashController', function ($scope, sources, contributors, dashif
             let config = JSON.parse(reqConfig.responseText);
             if ($scope.player) {
                 $scope.player.updateSettings(config);
+                setLatencyAttributes();
             }
         } else {
             // Set default initial configuration
@@ -256,8 +269,9 @@ app.controller('DashController', function ($scope, sources, contributors, dashif
                         }
                     }
                 }
-            }
+            };
             $scope.player.updateSettings(initialConfig);
+            setLatencyAttributes();
         }
     };
 
@@ -316,14 +330,6 @@ app.controller('DashController', function ($scope, sources, contributors, dashif
         $scope.player.attachTTMLRenderingDiv($('#video-caption')[0]);
     }
 
-    // get buffer default value
-    var currentConfig = $scope.player.getSettings();
-    $scope.defaultLiveDelay = currentConfig.streaming.liveDelay;
-    $scope.defaultStableBufferDelay = currentConfig.streaming.stableBufferTime;
-    $scope.defaultBufferTimeAtTopQuality = currentConfig.streaming.bufferTimeAtTopQuality;
-    $scope.defaultBufferTimeAtTopQualityLongForm = currentConfig.streaming.bufferTimeAtTopQualityLongForm;
-    $scope.lowLatencyModeSelected = currentConfig.streaming.lowLatencyEnabled;
-
     var initVideoTrackSwitchMode = $scope.player.getTrackSwitchModeFor('video');
     var initAudioTrackSwitchMode = $scope.player.getTrackSwitchModeFor('audio');
 
@@ -619,7 +625,16 @@ app.controller('DashController', function ($scope, sources, contributors, dashif
             });
         }
         if ($scope.initialSettings.text) {
-            $scope.player.setTextDefaultLanguage($scope.initialSettings.text);
+            if ($scope.initialSettings.textRole) {
+                $scope.player.setInitialMediaSettingsFor('fragmentedText', {
+                    role: $scope.initialSettings.textRole,
+                    lang: $scope.initialSettings.text
+                });
+            } else {
+                $scope.player.setInitialMediaSettingsFor('fragmentedText', {
+                    lang: $scope.initialSettings.text
+                });
+            }
         }
         $scope.player.setTextDefaultEnabled($scope.initialSettings.textEnabled);
         $scope.player.enableForcedTextStreaming($scope.initialSettings.forceTextStreaming);
@@ -925,6 +940,16 @@ app.controller('DashController', function ($scope, sources, contributors, dashif
         }
     }
 
+    function setLatencyAttributes() {
+        // get buffer default value
+        var currentConfig = $scope.player.getSettings();
+        $scope.defaultLiveDelay = currentConfig.streaming.liveDelay;
+        $scope.defaultStableBufferDelay = currentConfig.streaming.stableBufferTime;
+        $scope.defaultBufferTimeAtTopQuality = currentConfig.streaming.bufferTimeAtTopQuality;
+        $scope.defaultBufferTimeAtTopQualityLongForm = currentConfig.streaming.bufferTimeAtTopQualityLongForm;
+        $scope.lowLatencyModeSelected = currentConfig.streaming.lowLatencyEnabled;
+    }
+
 
     (function init() {
         $scope.initChartingByMediaType('video');
diff --git a/samples/dash-if-reference-player/app/sources.json b/samples/dash-if-reference-player/app/sources.json
index a26909b895..7706feb41b 100644
--- a/samples/dash-if-reference-player/app/sources.json
+++ b/samples/dash-if-reference-player/app/sources.json
@@ -1,959 +1,1059 @@
 {
-  "items": [
-    {
-      "name": "VOD (Static MPD)",
-      "submenu": [
-        {
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-events.mpd",
-          "name": "SegmentTemplate/Number, live profile",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        },
-        {
-          "url": "https://dash.akamaized.net/dash264/TestCases/1a/sony/SNE_DASH_SD_CASE1A_REVISED.mpd",
-          "name": "SegmentBase, ondemand profile"
-        },
-        {
-          "url": "//demo.unified-streaming.com/video/ateam/ateam.ism/ateam.mpd",
-          "name": "SegmentTimeline/Time"
-        },
-        {
-          "url": "http://dash.akamaized.net/dash264/TestCases/5a/1/manifest.mpd",
-          "name": "Multiperiod"
-        },
-        {
-          "url": "https://dash.akamaized.net/envivio/EnvivioDash3/manifest.mpd",
-          "name": "SegmentTemplate, live profile - Envivio"
-        },
-        {
-          "url": "https://dash.akamaized.net/akamai/test/caption_test/ElephantsDream/elephants_dream_480p_heaac5_1.mpd",
-          "name": "External VTT subtitle file"
-        },
-        {
-          "url": "https://dash.akamaized.net/akamai/bbb_30fps/bbb_30fps.mpd",
-          "name": "SegmentTemplate/Number, live profile, 250kbps up to 15Mbps@4K."
-        }
-      ]
-    },
-    {
-      "name": "LIVE (Dynamic MPD)",
-      "submenu": [
-        {
-          "url": "https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd",
-          "name": "SegmentTemplate without manifest updates (livesim)"
-        },
-        {
-          "url": "https://livesim.dashif.org/livesim/mup_30/testpic_2s/Manifest.mpd",
-          "name": "SegmentTemplate with manifest updates every 30s (livesim)"
-        },
-        {
-          "url": "https://livesim.dashif.org/livesim/segtimeline_1/testpic_2s/Manifest.mpd",
-          "name": "SegmentTimeline (livesim)"
-        },
-        {
-          "url": "https://livesim.dashif.org/livesim/periods_60/continuous_1/testpic_2s/Manifest.mpd",
-          "name": "Multiperiod SegmentTemplate. New period every minute (livesim)"
-        },
-        {
-            "url": "http://irtdashreference-i.akamaihd.net/dash/live/901161/bfs/manifestARD.mpd",
-            "name": "IRT reference with EBU-TT-D subtitles"
-        },
-        {
-            "url": "http://irtdashreference-i.akamaihd.net/dash/live/901161/keepixo1/manifestBR2.mpd",
-            "name": "IRT CMAF reference with subtitles"
-        },
-        {
-          "url": " https://livesim.dashif.org/livesim/ato_10/testpic_2s/Manifest.mpd",
-          "name": "10 seconds availabilityTimeOffset (livesim)"
-        },
-        {
-          "url": "https://livesim.dashif.org/livesim/ato_inf/testpic_2s/Manifest.mpd",
-          "name": "Infinite offset - all segments available at availability start (livesim)"
-        },
-        {
-          "url": "https://livesim.dashif.org/livesim-chunked/chunkdur_1/ato_7/testpic4_8s/Manifest300.mpd",
-          "name": "Low Latency (Single-Rate) (livesim-chunked)",
-          "bufferConfig" : {
-            "lowLatencyMode": true,
-            "liveDelay": 4
-          }
-        },
-        {
-          "url": "https://livesim.dashif.org/livesim-chunked/chunkdur_1/ato_7/testpic4_8s/Manifest.mpd",
-          "name": "Low Latency (Multi-Rate) (livesim-chunked)",
-          "bufferConfig" : {
-            "lowLatencyMode": true,
-            "liveDelay": 4
-          }
-        },
-        {
-          "url": "https://akamaibroadcasteruseast.akamaized.net/cmaf/live/657078/akasource/out.mpd",
-          "name": "Akamai Low Latency Stream",
-          "bufferConfig" : {
-            "lowLatencyMode": true,
-            "liveDelay": 3
-          }
-        },
-        {
-           "url": "https://live.unified-streaming.com/scte35/scte35.isml/.mpd",
-           "name": "Unified Streaming reference stream with scte35 markers",
-           "moreInfo": "http://demo.unified-streaming.com/features.html"
-        }
-      ]
-    },
-    {
-      "name": "Subtitles and Captions",
-      "submenu": [
-        {
-          "name": "TTML Segmented Subtitles VoD",
-          "url": "https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd"
-        },
-        {
-          "name": "TTML Segmented Subtitles Live (livesim)",
-          "url": "https://livesim.dashif.org/livesim/testpic_2s/multi_subs.mpd"
-        },
-        {
-          "name": "TTML Sideloaded XML Subtitles",
-          "url": "https://livesim.dashif.org/dash/vod/testpic_2s/xml_subs.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions",
-          "url": "https://livesim.dashif.org/dash/vod/testpic_2s/cea608.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions (livesim)",
-          "url": "https://livesim.dashif.org/livesim/testpic_2s/cea608.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions and TTML segments VoD",
-          "url": "https://livesim.dashif.org/dash/vod/testpic_2s/cea608_and_segs.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions and TTML segments Live (livesim)",
-          "url": "https://livesim.dashif.org/livesim/testpic_2s/cea608_and_segs.mpd"
-        },
-        {
-          "name": "TTML Segmented 'snaking' subtitles (with random text) (Ondemand)",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/1/client_manifest-snake.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/"
-        },
-        {
-            "url": "https://dash.akamaized.net/dash264/CTA/imsc1/IT1-20171027_dash.mpd",
-            "name": "IMSC1 Text Subtitles via sidecar file"
-        },
-        {
-          "url": "https://livesim.dashif.org/dash/vod/testpic_2s/imsc1_img.mpd",
-          "name": "IMSC1 (CMAF) Image Subtitles",
-          "moreInfo": "https://livesim.dashif.org/dash/vod/testpic_2s/imsc1_img_subs_info.html"
-        },
-        {
-          "name": "TTML Image Subtitles embedded (VoD)",
-          "url": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs.mpd",
-          "moreInfo": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs_info.html"
-        }
-      ]
-    },
-    {
-      "name": "Thumbnails",
-      "submenu": [
-        {
-          "name": "Single adaption set, 7 tiles at 10x1, each thumb 320x180",
-          "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_tiled_thumbnails.mpd"
-        },
-        {
-          "name": "Single adaption set, 4 tiles at 10x1, each thumb 205x115",
-          "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_4_tiles_thumbnails.mpd"
-        },
-        {
-          "name": "Single adaption set, 1 tile at 10x20, each thumb 102x58",
-          "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_tiled_thumbnails_2.mpd"
-        },
-        {
-          "name": "Two adaption sets with different thumb resolutions",
-          "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_multiple_tiled_thumbnails.mpd"
-        },
-        {
-          "name": "Live stream, Single adaptation set, 1x1 tiles (livesim)",
-          "url": "//livesim.dashif.org/livesim/testpic_2s/Manifest_thumbs.mpd"
-        },
-        {
-          "name": "SegmentBase, Single adaption set, 3x4 tiles",
-          "url": "https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-tiled-thumbnails-static.mpd"
-        },
-        {
-          "name": "SegmentTemplate with SegmentTimeline",
-          "url": "https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-tiled-thumbnails-timeline.ism/.mpd"
-        },
-        {
-          "name": "SegmentNumber",
-          "url": "https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-tiled-thumbnails-numbered.ism/.mpd"
-        }
-      ]
-    },
-    {
-      "name": "Audio-only",
-      "submenu": [
-        {
-          "name": "48k AAC-LC Stereo Beeps (Live)",
-          "url": "https://livesim.dashif.org/livesim/testpic_2s/audio.mpd"
-        },
-        {
-          "name": "48k AAC-LC Stereo Beeps (Ondemand)",
-          "url": "https://livesim.dashif.org/dash/vod/testpic_2s/audio.mpd"
-        },
-        {
-          "name": "128k AAC-LC Stereo 1kHz Tone (Ondemand)",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-audio-1kHz.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        },
-        {
-          "name": "128k/320k AAC-LC Stereo/5.1 'Testcard' (Ondemand)",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-audio.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        }
-      ]
-    },
-    {
-      "name": "Axinom Test Content (modern)",
-      "submenu": [
-        {
-          "name": "1080p with Widevine DRM, license expired after 60s",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImZpcnN0X3BsYXlfZXhwaXJhdGlvbiI6NjAsInBsYXlyZWFkeSI6eyJyZWFsX3RpbWVfZXhwaXJhdGlvbiI6dHJ1ZX0sImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.FAbIiPxX8BHi9RwfzD7Yn-wugU19ghrkBFKsaCPrZmU"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with W3C Clear Key, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_1080p_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-           "name": "2160p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-           "name": "2160p with W3C Clear Key, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-           "name": "2160p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_AudioOnly.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_AudioOnly.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with W3C Clear Key, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_AudioOnly_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_AudioOnly_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_AudioOnly.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 1080p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "CHJ4bvnnRl-jok5bDvj6RQ": "wyYRebq2Hu7JedLUBpURzw",
-                "wU8HCfK5RCeRa2G1JYZQag": "7fsXeXJHs8enQ0SEfkhTBQ",
-                "LW6Th2DKQUWuwsQIN7SwJg": "QtC_8bYPe-SfF9YDSE0MuQ",
-                "3gLwf6CYTuC1VpB8DRf7vA": "GQnGyyKBez4x8aNTD6cNzw",
-                "kU5p9AqzRTSen5hTYV4m9g": "0DBllUYESc5WdSJMebqlBA",
-                "KfBej6GuRuSA6SLc1EzXoQ": "BxGxfISpDLtBCXJkyQG3Mg",
-                "af5wd9rdS1WWzcPts5kYUw": "7TqCUJKmSlCbdIeJ0xbAgQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 2160p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "CHJ4bvnnRl-jok5bDvj6RQ": "wyYRebq2Hu7JedLUBpURzw",
-                "wU8HCfK5RCeRa2G1JYZQag": "7fsXeXJHs8enQ0SEfkhTBQ",
-                "LW6Th2DKQUWuwsQIN7SwJg": "QtC_8bYPe-SfF9YDSE0MuQ",
-                "3gLwf6CYTuC1VpB8DRf7vA": "GQnGyyKBez4x8aNTD6cNzw",
-                "kU5p9AqzRTSen5hTYV4m9g": "0DBllUYESc5WdSJMebqlBA",
-                "KfBej6GuRuSA6SLc1EzXoQ": "BxGxfISpDLtBCXJkyQG3Mg",
-                "af5wd9rdS1WWzcPts5kYUw": "7TqCUJKmSlCbdIeJ0xbAgQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period audio with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_AudioOnly.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period audio with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_AudioOnly_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "CHJ4bvnnRl-jok5bDvj6RQ": "wyYRebq2Hu7JedLUBpURzw",
-                "wU8HCfK5RCeRa2G1JYZQag": "7fsXeXJHs8enQ0SEfkhTBQ",
-                "LW6Th2DKQUWuwsQIN7SwJg": "QtC_8bYPe-SfF9YDSE0MuQ",
-                "3gLwf6CYTuC1VpB8DRf7vA": "GQnGyyKBez4x8aNTD6cNzw",
-                "kU5p9AqzRTSen5hTYV4m9g": "0DBllUYESc5WdSJMebqlBA",
-                "KfBej6GuRuSA6SLc1EzXoQ": "BxGxfISpDLtBCXJkyQG3Mg",
-                "af5wd9rdS1WWzcPts5kYUw": "7TqCUJKmSlCbdIeJ0xbAgQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period audio without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod_AudioOnly.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Complex multi-period with different content, encrypted",
-          "url": "https://media.axprod.net/TestVectors/v8-MultiContent/Encrypted/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXNzYWdlIjp7InBsYXlyZWFkeSI6eyJtaW5fYXBwX3NlY3VyaXR5X2xldmVsIjoxNTAsInBsYXlfZW5hYmxlcnMiOlsiNzg2NjI3RDgtQzJBNi00NEJFLThGODgtMDhBRTI1NUIwMUE3Il19LCJrZXlzIjpbeyJlbmNyeXB0ZWRfa2V5IjoiN1hIS21uL3NmdnVQTFd0UHRHVFpEUT09IiwiaWQiOiIxZWIzMzJiMi03NDM3LTQ5YWUtYmYzOS1lNzAwMTBjYjYyMGIifSx7ImVuY3J5cHRlZF9rZXkiOiJzUXRGWDh6Y2o5bEVyZ282RDdjNGh3PT0iLCJpZCI6IjlhYTYwZTNhLTljOTEtNDc0ZC04OTM3LTdkOGIzMjU5Y2NjZCJ9LHsiZW5jcnlwdGVkX2tleSI6Im8wUlY0a2tuVE1KTFFkeVh1a1VlT2c9PSIsImlkIjoiNTk0Nzk3YTctNmIwMC00NjczLWIyZTEtYWVmYzU1MmIxYmJjIn0seyJlbmNyeXB0ZWRfa2V5IjoiZVl1dlIvS1BhWCtXWG43Rkw5WkNxQT09IiwiaWQiOiJhYWUyNTc1OC1lNDgxLTQ4OTUtODEzMy1iODA5NDgzMzkzZDAifSx7ImVuY3J5cHRlZF9rZXkiOiIwQ1BUWVpMWmk1SmhZZ0NiZThKTnhRPT0iLCJpZCI6IjkzMTEzZDVlLTJlYzgtNDNjMS05MDgzLTEwZjNkZTIwM2EyOSJ9LHsiZW5jcnlwdGVkX2tleSI6IlFQUlBrQ09tenNORkl1cCszSFp3WWc9PSIsImlkIjoiZTQ4NzcwMzctNDM3Ni00ZWRkLTg1ODYtMTQ1MTk0MzU4ODAzIn0seyJlbmNyeXB0ZWRfa2V5IjoiVWtrWUZ0TXJGMnlET0hvYWxKRmZSZz09IiwiaWQiOiJlOGFkNTk3Mi04ODE5LTQzMjYtYWQ2YS1mOWExNTE2OGJjYTcifSx7ImVuY3J5cHRlZF9rZXkiOiJkdWhnRVJSRkRiZlFEcnlwUWRCUUVRPT0iLCJpZCI6IjI2YTA5MzlmLTNhMGMtNDI4OS1hZDZiLWJiNWNlYzE3ZmY0MCJ9LHsiZW5jcnlwdGVkX2tleSI6IjFOUHp1Q1JLM3p4bWpYK3FZZnU1bXc9PSIsImlkIjoiYTVlZDcxNzMtMzc4MS00Yzc0LTkwYWMtZjA4MzRlZjFhMWM4In0seyJlbmNyeXB0ZWRfa2V5IjoiYXVQTEJjd2NmTnFSRTV1WFdUZ1NLUT09IiwiaWQiOiIzMjlmNTMzZS1mYTc3LTQwNzAtYjY1Yi0zOTI5ODBiYWRhMGQifSx7ImVuY3J5cHRlZF9rZXkiOiI2NkE1MnFiZEcyQlg3SUhTaml6WUpRPT0iLCJpZCI6IjE5N2Y4Yjg0LTNiZjItNDg2MC1iMjNhLTVjNTQ2MjhhZDBiMSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhIUUE3WWlEZGZwTE05QWxwcklDK2c9PSIsImlkIjoiNGVjZGQ0YzctNGQyOS00M2ZmLWJkYWYtMDJiNzY5MDBmMTIzIn0seyJlbmNyeXB0ZWRfa2V5IjoiblBqNWl3N1IvZDR0WmdKZktoRFhYZz09IiwiaWQiOiJlZTc0NmQxMi1hNDg4LTQ5NzctYjFjYS03N2ExMDFiYjQ4M2MifSx7ImVuY3J5cHRlZF9rZXkiOiJ5U1Vma0Q5ZEliK0ExNmoydHNzNDV3PT0iLCJpZCI6IjQ5NGY5NmUxLTM1MzUtNGE4NC05MWMxLWZhYTI4M2IwNmE1NCJ9LHsiZW5jcnlwdGVkX2tleSI6InJlUHVsaXg0eFZNZHlsUnVpcG5FK0E9PSIsImlkIjoiNWMwN2JmZjQtYzcwYi00ZDAyLWEzNzgtMzgzMjZmOTEwMDBjIn0seyJlbmNyeXB0ZWRfa2V5Ijoialc3Z2E0aytMcDdxWTd4Zmo5dHB5Zz09IiwiaWQiOiIzMjgzYzM1ZS1hZTJjLTRmOGMtOGE0OS00YTc1MGFlZGYxNDIifSx7ImVuY3J5cHRlZF9rZXkiOiJLdHNNYlZRM0JXL1dwQlIwSlQwa2R3PT0iLCJpZCI6IjhkNzdiOWM0LTdmNmQtNDdmOS04NTYyLWE1ZTVlNGMzNTFjZSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhRTGZKQUpmSjFyelFMZGNFRWM5L2c9PSIsImlkIjoiODIzMTcxZDctZGZjMS00ZDBlLTgwM2YtNDBhMWY1ZTQzODY4In0seyJlbmNyeXB0ZWRfa2V5IjoiR0hQSVNYTXZKWEJ6WktGQm1ZMXFCZz09IiwiaWQiOiJjMTYyYWM3ZC00MGQ3LTQ2YzAtYjJjZC1lOTQyN2Q0MzljMzIifSx7ImVuY3J5cHRlZF9rZXkiOiJ2bzJhamlLaWV6Yk9xY2tyNTN0U3B3PT0iLCJpZCI6ImZhYTZkNmY1LTM1MDEtNDg1MS05MmViLWM3ZGE0NDRlY2FhYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ijg2QkEwUHYwYXk4UmV5Wk4zeElYa2c9PSIsImlkIjoiZmM0OWI3MTEtMWNiNi00MGE3LTk4NDAtODNjNDFiNTViOTliIn0seyJlbmNyeXB0ZWRfa2V5IjoibUhBbERaa0NYQWpCR1pLR2h0Y3Zpdz09IiwiaWQiOiI0M2QwMjIwNC04NjA5LTRkNDYtOTlhYy00MjVhNWI0ODAwOTgifSx7ImVuY3J5cHRlZF9rZXkiOiJ3bWhjREdZcG84YlZBSit0OGF4SUZnPT0iLCJpZCI6IjRkNmU0OTZhLTFmOTgtNGVlOC04Zjg3LTRiMTAzYmQzOGQwZiJ9LHsiZW5jcnlwdGVkX2tleSI6Ik92cWF3Y0JVQVE3cHM2T0xhSnZPRmc9PSIsImlkIjoiYzRlMGQ5ZjctZDQ4Mi00MWMzLThjYmItOTdiMTEyZDcyZTY2In0seyJlbmNyeXB0ZWRfa2V5IjoiM3dTMkdpemxWcGtuNDlRRExxcFBhZz09IiwiaWQiOiIxYzJkZTFlNC1lZDMwLTQ0NTItYTExNS0wOTIzYjk0MGM0ZWQifSx7ImVuY3J5cHRlZF9rZXkiOiJTNWRGQ25yRUNjREswOEVreHllY3lRPT0iLCJpZCI6ImRjZjQzODVmLTM1MDUtNGZmNS1iMDU1LTQ2MWQ1YTA3ZjBmNSJ9LHsiZW5jcnlwdGVkX2tleSI6IlBnRUhyK0Nrd3JYTStlSWFnUnl4b3c9PSIsImlkIjoiZjMyNGYwNGUtN2M3My00ZjM3LTgxMzUtYzg5ZjhjNGU2Y2Y0In0seyJlbmNyeXB0ZWRfa2V5IjoiSkx6UUZGMXp4MFpZMzZYSTdaR0VaUT09IiwiaWQiOiI1Y2I1M2RkOC0xMjk0LTRjOGUtOTY0ZS0yNTg2OWQ1M2EyNGEifSx7ImVuY3J5cHRlZF9rZXkiOiJVOHBRdW1HUmtrTGppSEg1cjlqWGhnPT0iLCJpZCI6IjA1NjgyYTI2LTg4NzctNDZkMy05NDY1LTEwNGEzYTQwMDEwYSJ9LHsiZW5jcnlwdGVkX2tleSI6IlVJTDZKNGRzZEpGNi9tQTM1dHIvVFE9PSIsImlkIjoiYmNlNTM0MTAtM2IwYy00OTE0LTg3YTMtNzIzNjNjYTE3NTMxIn0seyJlbmNyeXB0ZWRfa2V5IjoiM3pCaW1Dc2NlMTV2YkV0Mm8zNEhhUT09IiwiaWQiOiI0ZjRmOGExYy0zMjAyLTQ2YWUtODA5ZS00ZmNmOTMzZWU2NTQifSx7ImVuY3J5cHRlZF9rZXkiOiJDVHdTU3RQMnV1QjVZdStNUGpZY29RPT0iLCJpZCI6Ijg1MmNkN2Y3LTQwZTktNDgyZC04MjI1LWRjYmM4ZTA4ZGI4YiJ9LHsiZW5jcnlwdGVkX2tleSI6Im1ubXRuUWVHYm0rZUEzN2t6dFovRVE9PSIsImlkIjoiZWZkZGI4ZWUtODI3OC00NDM2LWE2OTgtNzJiODAzZDA1MGRiIn0seyJlbmNyeXB0ZWRfa2V5Ijoib3BicXltZVRiT3VWalJnYjJHMHpVdz09IiwiaWQiOiJkNWJkYmE1My02MDZmLTRkNDYtODg4ZC1hMWViNDRjZDVmNDEifSx7ImVuY3J5cHRlZF9rZXkiOiJiSWRsOFhoVmdobmc4Tis4cUZVbFRnPT0iLCJpZCI6ImFlZDQ5NjA5LTUwOTktNDExOC05YjA4LWI5NTM4ZGIwMGMwYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ikp1SS9UMSt5cUtzUU95MjZEbzRuZmc9PSIsImlkIjoiN2I1YzFlOWYtZjhiOC00OTkyLWFhM2UtYTA4NWZjMzY3MzExIn0seyJlbmNyeXB0ZWRfa2V5IjoiM2ladUZxalh3bzhiN1lkamxKZUVPUT09IiwiaWQiOiI1YmU0MGViZi0yZWE0LTQ5ZmItYjZlYy1iMDlkZTVhYjYxN2YifSx7ImVuY3J5cHRlZF9rZXkiOiJoQ3gybzJxQlJKL2hiZVNqKzY5dHF3PT0iLCJpZCI6ImU1MzBkZjFiLWZmN2UtNDJhNC1iNTNhLThkNmRlNjhmMDAxMCJ9LHsiZW5jcnlwdGVkX2tleSI6IjhveWlGM0pQTmdzd0tPajVrWjVIT0E9PSIsImlkIjoiYjk0OTg3NDUtODJlYS00ZmZhLWFiMmItZDczN2VmNTRmODYzIn0seyJlbmNyeXB0ZWRfa2V5IjoiTEs4TENTY28zQmZYZXhLMlh0WUZSQT09IiwiaWQiOiI0ZjUyOTc1Yi1lOWYzLTRmZDctYmI4OS00MDNiMjgwMGU4Y2YifV0sInR5cGUiOiJlbnRpdGxlbWVudF9tZXNzYWdlIn0sImNvbV9rZXlfaWQiOiJiMzM2NGViNS01MWY2LTRhZTMtOGM5OC0zM2NlZDVlMzFjNzgiLCJ2ZXJzaW9uIjoxfQ.kuZip7wOBZ6-FjAO_VcBq0r816426dFK4fTdfm99NqE"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXNzYWdlIjp7InBsYXlyZWFkeSI6eyJtaW5fYXBwX3NlY3VyaXR5X2xldmVsIjoxNTAsInBsYXlfZW5hYmxlcnMiOlsiNzg2NjI3RDgtQzJBNi00NEJFLThGODgtMDhBRTI1NUIwMUE3Il19LCJrZXlzIjpbeyJlbmNyeXB0ZWRfa2V5IjoiN1hIS21uL3NmdnVQTFd0UHRHVFpEUT09IiwiaWQiOiIxZWIzMzJiMi03NDM3LTQ5YWUtYmYzOS1lNzAwMTBjYjYyMGIifSx7ImVuY3J5cHRlZF9rZXkiOiJzUXRGWDh6Y2o5bEVyZ282RDdjNGh3PT0iLCJpZCI6IjlhYTYwZTNhLTljOTEtNDc0ZC04OTM3LTdkOGIzMjU5Y2NjZCJ9LHsiZW5jcnlwdGVkX2tleSI6Im8wUlY0a2tuVE1KTFFkeVh1a1VlT2c9PSIsImlkIjoiNTk0Nzk3YTctNmIwMC00NjczLWIyZTEtYWVmYzU1MmIxYmJjIn0seyJlbmNyeXB0ZWRfa2V5IjoiZVl1dlIvS1BhWCtXWG43Rkw5WkNxQT09IiwiaWQiOiJhYWUyNTc1OC1lNDgxLTQ4OTUtODEzMy1iODA5NDgzMzkzZDAifSx7ImVuY3J5cHRlZF9rZXkiOiIwQ1BUWVpMWmk1SmhZZ0NiZThKTnhRPT0iLCJpZCI6IjkzMTEzZDVlLTJlYzgtNDNjMS05MDgzLTEwZjNkZTIwM2EyOSJ9LHsiZW5jcnlwdGVkX2tleSI6IlFQUlBrQ09tenNORkl1cCszSFp3WWc9PSIsImlkIjoiZTQ4NzcwMzctNDM3Ni00ZWRkLTg1ODYtMTQ1MTk0MzU4ODAzIn0seyJlbmNyeXB0ZWRfa2V5IjoiVWtrWUZ0TXJGMnlET0hvYWxKRmZSZz09IiwiaWQiOiJlOGFkNTk3Mi04ODE5LTQzMjYtYWQ2YS1mOWExNTE2OGJjYTcifSx7ImVuY3J5cHRlZF9rZXkiOiJkdWhnRVJSRkRiZlFEcnlwUWRCUUVRPT0iLCJpZCI6IjI2YTA5MzlmLTNhMGMtNDI4OS1hZDZiLWJiNWNlYzE3ZmY0MCJ9LHsiZW5jcnlwdGVkX2tleSI6IjFOUHp1Q1JLM3p4bWpYK3FZZnU1bXc9PSIsImlkIjoiYTVlZDcxNzMtMzc4MS00Yzc0LTkwYWMtZjA4MzRlZjFhMWM4In0seyJlbmNyeXB0ZWRfa2V5IjoiYXVQTEJjd2NmTnFSRTV1WFdUZ1NLUT09IiwiaWQiOiIzMjlmNTMzZS1mYTc3LTQwNzAtYjY1Yi0zOTI5ODBiYWRhMGQifSx7ImVuY3J5cHRlZF9rZXkiOiI2NkE1MnFiZEcyQlg3SUhTaml6WUpRPT0iLCJpZCI6IjE5N2Y4Yjg0LTNiZjItNDg2MC1iMjNhLTVjNTQ2MjhhZDBiMSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhIUUE3WWlEZGZwTE05QWxwcklDK2c9PSIsImlkIjoiNGVjZGQ0YzctNGQyOS00M2ZmLWJkYWYtMDJiNzY5MDBmMTIzIn0seyJlbmNyeXB0ZWRfa2V5IjoiblBqNWl3N1IvZDR0WmdKZktoRFhYZz09IiwiaWQiOiJlZTc0NmQxMi1hNDg4LTQ5NzctYjFjYS03N2ExMDFiYjQ4M2MifSx7ImVuY3J5cHRlZF9rZXkiOiJ5U1Vma0Q5ZEliK0ExNmoydHNzNDV3PT0iLCJpZCI6IjQ5NGY5NmUxLTM1MzUtNGE4NC05MWMxLWZhYTI4M2IwNmE1NCJ9LHsiZW5jcnlwdGVkX2tleSI6InJlUHVsaXg0eFZNZHlsUnVpcG5FK0E9PSIsImlkIjoiNWMwN2JmZjQtYzcwYi00ZDAyLWEzNzgtMzgzMjZmOTEwMDBjIn0seyJlbmNyeXB0ZWRfa2V5Ijoialc3Z2E0aytMcDdxWTd4Zmo5dHB5Zz09IiwiaWQiOiIzMjgzYzM1ZS1hZTJjLTRmOGMtOGE0OS00YTc1MGFlZGYxNDIifSx7ImVuY3J5cHRlZF9rZXkiOiJLdHNNYlZRM0JXL1dwQlIwSlQwa2R3PT0iLCJpZCI6IjhkNzdiOWM0LTdmNmQtNDdmOS04NTYyLWE1ZTVlNGMzNTFjZSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhRTGZKQUpmSjFyelFMZGNFRWM5L2c9PSIsImlkIjoiODIzMTcxZDctZGZjMS00ZDBlLTgwM2YtNDBhMWY1ZTQzODY4In0seyJlbmNyeXB0ZWRfa2V5IjoiR0hQSVNYTXZKWEJ6WktGQm1ZMXFCZz09IiwiaWQiOiJjMTYyYWM3ZC00MGQ3LTQ2YzAtYjJjZC1lOTQyN2Q0MzljMzIifSx7ImVuY3J5cHRlZF9rZXkiOiJ2bzJhamlLaWV6Yk9xY2tyNTN0U3B3PT0iLCJpZCI6ImZhYTZkNmY1LTM1MDEtNDg1MS05MmViLWM3ZGE0NDRlY2FhYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ijg2QkEwUHYwYXk4UmV5Wk4zeElYa2c9PSIsImlkIjoiZmM0OWI3MTEtMWNiNi00MGE3LTk4NDAtODNjNDFiNTViOTliIn0seyJlbmNyeXB0ZWRfa2V5IjoibUhBbERaa0NYQWpCR1pLR2h0Y3Zpdz09IiwiaWQiOiI0M2QwMjIwNC04NjA5LTRkNDYtOTlhYy00MjVhNWI0ODAwOTgifSx7ImVuY3J5cHRlZF9rZXkiOiJ3bWhjREdZcG84YlZBSit0OGF4SUZnPT0iLCJpZCI6IjRkNmU0OTZhLTFmOTgtNGVlOC04Zjg3LTRiMTAzYmQzOGQwZiJ9LHsiZW5jcnlwdGVkX2tleSI6Ik92cWF3Y0JVQVE3cHM2T0xhSnZPRmc9PSIsImlkIjoiYzRlMGQ5ZjctZDQ4Mi00MWMzLThjYmItOTdiMTEyZDcyZTY2In0seyJlbmNyeXB0ZWRfa2V5IjoiM3dTMkdpemxWcGtuNDlRRExxcFBhZz09IiwiaWQiOiIxYzJkZTFlNC1lZDMwLTQ0NTItYTExNS0wOTIzYjk0MGM0ZWQifSx7ImVuY3J5cHRlZF9rZXkiOiJTNWRGQ25yRUNjREswOEVreHllY3lRPT0iLCJpZCI6ImRjZjQzODVmLTM1MDUtNGZmNS1iMDU1LTQ2MWQ1YTA3ZjBmNSJ9LHsiZW5jcnlwdGVkX2tleSI6IlBnRUhyK0Nrd3JYTStlSWFnUnl4b3c9PSIsImlkIjoiZjMyNGYwNGUtN2M3My00ZjM3LTgxMzUtYzg5ZjhjNGU2Y2Y0In0seyJlbmNyeXB0ZWRfa2V5IjoiSkx6UUZGMXp4MFpZMzZYSTdaR0VaUT09IiwiaWQiOiI1Y2I1M2RkOC0xMjk0LTRjOGUtOTY0ZS0yNTg2OWQ1M2EyNGEifSx7ImVuY3J5cHRlZF9rZXkiOiJVOHBRdW1HUmtrTGppSEg1cjlqWGhnPT0iLCJpZCI6IjA1NjgyYTI2LTg4NzctNDZkMy05NDY1LTEwNGEzYTQwMDEwYSJ9LHsiZW5jcnlwdGVkX2tleSI6IlVJTDZKNGRzZEpGNi9tQTM1dHIvVFE9PSIsImlkIjoiYmNlNTM0MTAtM2IwYy00OTE0LTg3YTMtNzIzNjNjYTE3NTMxIn0seyJlbmNyeXB0ZWRfa2V5IjoiM3pCaW1Dc2NlMTV2YkV0Mm8zNEhhUT09IiwiaWQiOiI0ZjRmOGExYy0zMjAyLTQ2YWUtODA5ZS00ZmNmOTMzZWU2NTQifSx7ImVuY3J5cHRlZF9rZXkiOiJDVHdTU3RQMnV1QjVZdStNUGpZY29RPT0iLCJpZCI6Ijg1MmNkN2Y3LTQwZTktNDgyZC04MjI1LWRjYmM4ZTA4ZGI4YiJ9LHsiZW5jcnlwdGVkX2tleSI6Im1ubXRuUWVHYm0rZUEzN2t6dFovRVE9PSIsImlkIjoiZWZkZGI4ZWUtODI3OC00NDM2LWE2OTgtNzJiODAzZDA1MGRiIn0seyJlbmNyeXB0ZWRfa2V5Ijoib3BicXltZVRiT3VWalJnYjJHMHpVdz09IiwiaWQiOiJkNWJkYmE1My02MDZmLTRkNDYtODg4ZC1hMWViNDRjZDVmNDEifSx7ImVuY3J5cHRlZF9rZXkiOiJiSWRsOFhoVmdobmc4Tis4cUZVbFRnPT0iLCJpZCI6ImFlZDQ5NjA5LTUwOTktNDExOC05YjA4LWI5NTM4ZGIwMGMwYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ikp1SS9UMSt5cUtzUU95MjZEbzRuZmc9PSIsImlkIjoiN2I1YzFlOWYtZjhiOC00OTkyLWFhM2UtYTA4NWZjMzY3MzExIn0seyJlbmNyeXB0ZWRfa2V5IjoiM2ladUZxalh3bzhiN1lkamxKZUVPUT09IiwiaWQiOiI1YmU0MGViZi0yZWE0LTQ5ZmItYjZlYy1iMDlkZTVhYjYxN2YifSx7ImVuY3J5cHRlZF9rZXkiOiJoQ3gybzJxQlJKL2hiZVNqKzY5dHF3PT0iLCJpZCI6ImU1MzBkZjFiLWZmN2UtNDJhNC1iNTNhLThkNmRlNjhmMDAxMCJ9LHsiZW5jcnlwdGVkX2tleSI6IjhveWlGM0pQTmdzd0tPajVrWjVIT0E9PSIsImlkIjoiYjk0OTg3NDUtODJlYS00ZmZhLWFiMmItZDczN2VmNTRmODYzIn0seyJlbmNyeXB0ZWRfa2V5IjoiTEs4TENTY28zQmZYZXhLMlh0WUZSQT09IiwiaWQiOiI0ZjUyOTc1Yi1lOWYzLTRmZDctYmI4OS00MDNiMjgwMGU4Y2YifV0sInR5cGUiOiJlbnRpdGxlbWVudF9tZXNzYWdlIn0sImNvbV9rZXlfaWQiOiJiMzM2NGViNS01MWY2LTRhZTMtOGM5OC0zM2NlZDVlMzFjNzgiLCJ2ZXJzaW9uIjoxfQ.kuZip7wOBZ6-FjAO_VcBq0r816426dFK4fTdfm99NqE"
-              },
-              "httpTimeout": 5000
-            }
-          }
-        },
-        {
-          "name": "Complex multi-period with different content, clear",
-          "url": "https://media.axprod.net/TestVectors/v8-MultiContent/Clear/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
+    "provider": {
+        "dashif": {
+            "acronym": "DASH-IF",
+            "name": "DASH Industry Forum",
+            "url": "https://dashif.org/"
+        },
+        "unified": {
+            "acronym": "Unified Streaming",
+            "name": "Unified Streaming",
+            "url": "https://www.unified-streaming.com/"
+        },
+        "bbc":{
+            "acronym": "BBC",
+            "name": "British Broadcasting Corporation",
+            "url": "https://www.bbc.com/"
+        },
+        "envivio":{
+            "acronym": "Envivio",
+            "name": "Envivio"
+        },
+        "irt":{
+            "acronym": "IRT",
+            "name": "Institut fuer Rundfunktechnik",
+            "url": "https://www.irt.de/de/home"
+        },
+        "akamai": {
+            "acronym": "Akamai",
+            "name": "Akamai",
+            "url": "https://www.akamai.com/de/de/"   
+        },
+        "cta": {
+            "acronym": "CTA",
+            "name": "Consumer Technology Association",
+            "url": "https://cta.tech/Resources/Standards/WAVE-Project"
+        },
+        "axinom": {
+            "acronym": "Axinom",
+            "name": "Axinom",
+            "url": "https://drm.axinom.com/"
+        },
+        "microsoft": {
+            "acronym": "Microsoft",
+            "name": "Microsoft",
+            "url": "https://www.microsoft.com/de-de/"    
+        },
+        "streamroot": {
+            "acronym": "Streamroot",
+            "name": "Streamroot",
+            "url": "https://streamroot.io/"
+        },
+        "wowza": {
+            "acronym": "Wowza",
+            "name": "Wowza",
+            "url": "https://www.wowza.com/"
         }
-      ]
     },
-    {
-      "name": "Axinom Test Content (conservative/legacy)",
-      "submenu": [
-        {
-          "name": "1080p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              },
-              "httpTimeout": 5000,
-              "audioRobustness": "SW_SECURE_CRYPTO",
-              "videoRobustness": "SW_SECURE_DECODE"
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/Manifest_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "2160p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/MultiPeriod_Manifest_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey-MultiPeriod/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              },
-              "httpTimeout": 5000
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              },
-              "httpTimeout": 5000
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/MultiPeriod_Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        }
-      ]
-    },
-    {
-      "name": "BBC R&D Test Content",
-      "submenu": [
-        {
-          "name": "BBC R&D Testcard",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-events.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        },
-        {
-          "name": "BBC R&D EBU-TT-D Subtitling Test",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/1/client_manifest-all.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/"
-        }
-      ]
-    },
-    {
-      "name": "Microsoft Test Content",
-      "submenu": [
-        {
-          "name": "Microsoft AZURE MEDIA SERVICES ON DEMAND H264 AAC 4K CENC PLAYREADY 2.0",
-          "url": "https://profficialsite.origin.mediaservices.windows.net/c51358ea-9a5e-4322-8951-897d640fdfd7/tearsofsteel_4k.ism/manifest(format=mpd-time-csf)",
-          "protData": {
-            "com.microsoft.playready": {
-              "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx"
-            }
-          }
-        },
-        {
-          "name": "Microsoft AZURE MEDIA SERVICES ON DEMAND H264 AAC 4K CENC PLAYREADY 2.0 (persistent)",
-          "url": "https://profficialsite.origin.mediaservices.windows.net/c51358ea-9a5e-4322-8951-897d640fdfd7/tearsofsteel_4k.ism/manifest(format=mpd-time-csf)",
-          "protData": {
-            "com.microsoft.playready": {
-              "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(persist:true,sl:150)",
-              "sessionType": "persistent-license"
-            }
-          }
-        },
-        {
-          "name": "Source: XBox One commercial video",
-          "url": "https://profficialsite.origin.mediaservices.windows.net/9cc5e871-68ec-42c2-9fc7-fda95521f17d/dayoneplayready.ism/manifest(format=mpd-time-csf)",
-          "protData": {
-            "com.microsoft.playready": {
-              "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx"
-            }
-          }
-        },
-        {
-          "name": "AZURE MEDIA SERVICES LIVE PLAYREADY 2.0",
-          "url": "https://profficialsite.origin.mediaservices.windows.net/9cc5e871-68ec-42c2-9fc7-fda95521f17d/dayoneplayready.ism/manifest(format=mpd-time-csf)",
-          "protData": {
-            "com.microsoft.playready": {
-              "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx"
-            }
-          }
-        }
-      ]
-    },
-    {
-      "name": "Wowza Test Content",
-      "submenu": [
-        {
-          "name": "Clear Dynamic SegmentTimeline",
-          "url": "//wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvtime.mpd"
-        },
-        {
-          "name": "Clear Dynamic SegmentTemplate",
-          "url": "//wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvnumber.mpd"
-        },
-        {
-          "name": "Clear Dynamic SegmentList",
-          "url": "//wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvlist.mpd"
-        },
-        {
-          "name": "Clear Static SegmentTimeline",
-          "url": "//wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvtime.mpd"
-        },
-        {
-          "name": "Clear Static SegmentTemplate",
-          "url": "//wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvnumber.mpd"
-        },
-        {
-          "name": "Clear Static SegmentList",
-          "url": "//wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvlist.mpd"
-        },
-        {
-          "name": "Widevine Dynamic SegmentTimeline",
-          "url": "https://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvtime.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Dynamic SegmentTemplate",
-          "url": "https://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvnumber.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Dynamic SegmentList",
-          "url": "https://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvlist.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Static SegmentTimeline",
-          "url": "https://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvtime.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Static SegmentTemplate",
-          "url": "https://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvnumber.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Static SegmentList",
-          "url": "https://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvlist.mpd ",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        }
-      ]
-    },
-    {
-      "name": "Other samples",
-      "submenu": [
-        {
-          "name": "4K",
-          "url": "https://dash.akamaized.net/akamai/streamroot/050714/Spring_4Ktest.mpd"
-        },
-        {
-          "name": "Unified Streaming - Timeline",
-          "url": "//demo.unified-streaming.com/video/ateam/ateam.ism/ateam.mpd"
-        },
-        {
-          "name": "Unified Streaming (Widevine, persistent)",
-          "url": "//demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-dash-widevine.ism/.mpd",
-          "protData": {
-              "com.widevine.alpha": {
-                  "serverURL": "https://cwip-shaka-proxy.appspot.com/no_auth",
-                  "sessionType": "persistent-license"
-              }
-          }
-        }
-      ]
-    },
-    {
-      "name": "Smooth Streaming",
-      "submenu": [
-        {
-          "url": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism/Manifest",
-          "name": "Super Speedway"
-        },
-        {
-          "url": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism/Manifest",
-          "name": "Super Speedway + PlayReady DRM",
-          "protData": {
-            "com.microsoft.playready": {
-            }}
-        },
-        {
-          "url": "http://test.playready.microsoft.com/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism/Manifest",
-          "name": "Super Speedway + PlayReady DRM (persistent)",
-          "protData": {
-            "com.microsoft.playready": {
-                "serverURL": "http://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(persist:true,sl:150)",
-                "sessionType": "persistent-license"
-              }
-          }
+    "items": [
+        {
+            "name": "VOD (Static MPD)",
+            "submenu": [
+                {
+                    "url": "https://dash.akamaized.net/dash264/TestCases/1a/sony/SNE_DASH_SD_CASE1A_REVISED.mpd",
+                    "name": "SegmentBase, ondemand profile",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://dash.akamaized.net/akamai/bbb_30fps/bbb_30fps.mpd",
+                    "name": "SegmentTemplate/Number, live profile, 250kbps up to 15Mbps@4K.",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://dash.akamaized.net/dash264/TestCases/2c/qualcomm/1/MultiResMPEG2.mpd",
+                    "name": "SegmentTemplate/SegmentTimeline $time, ondemand profile",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://dash.akamaized.net/dash264/TestCases/5a/nomor/1.mpd",
+                    "name": "Multiperiod, 2 periods, SegmentTemplate $number",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://dash.akamaized.net/envivio/EnvivioDash3/manifest.mpd",
+                    "name": "SegmentTemplate, live profile",
+                    "provider": "envivio"
+                },
+                {
+                    "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-events.mpd",
+                    "name": "SegmentTemplate/Number, live profile",
+                    "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/",
+                    "provider": "bbc"
+                },
+                {
+                    "name": "SegmentTemplate with SegmentTimeline",
+                    "url": "https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel.ism/.mpd",
+                    "provider": "unified"
+                },
+                {
+                    "name": "1080p without encryption",
+                    "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_1080p.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "2160p without encryption",
+                    "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 1080p without encryption",
+                    "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod_1080p.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 2160p without encryption",
+                    "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Complex multi-period with different content, clear",
+                    "url": "https://media.axprod.net/TestVectors/v8-MultiContent/Clear/Manifest.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "4K SegmentBase ",
+                    "url": "https://dash.akamaized.net/akamai/streamroot/050714/Spring_4Ktest.mpd",
+                    "provider": "streamroot"
+                },
+                {
+                    "name": "Clear Static SegmentTimeline",
+                    "url": "//wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvtime.mpd",
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Clear Static SegmentTemplate",
+                    "url": "//wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvnumber.mpd",
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Clear Static SegmentList",
+                    "url": "//wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvlist.mpd",
+                    "provider": "wowza"
+                }
+            ]
+        },
+        {
+            "name": "LIVE (Dynamic MPD)",
+            "submenu": [
+                {
+                    "url": "https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd",
+                    "name": "SegmentTemplate without manifest updates (livesim)",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://livesim.dashif.org/livesim/mup_30/testpic_2s/Manifest.mpd",
+                    "name": "SegmentTemplate with manifest updates every 30s (livesim)",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://livesim.dashif.org/livesim/segtimeline_1/testpic_2s/Manifest.mpd",
+                    "name": "SegmentTimeline (livesim)",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://livesim.dashif.org/livesim/periods_60/continuous_1/testpic_2s/Manifest.mpd",
+                    "name": "Multiperiod SegmentTemplate. New period every minute (livesim)",
+                    "provider": "dashif"
+                },
+                {
+                    "url": " https://livesim.dashif.org/livesim/ato_10/testpic_2s/Manifest.mpd",
+                    "name": "10 seconds availabilityTimeOffset (livesim)",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://livesim.dashif.org/livesim/ato_inf/testpic_2s/Manifest.mpd",
+                    "name": "Infinite offset - all segments available at availability start (livesim)",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://livesim.dashif.org/livesim-chunked/chunkdur_1/ato_7/testpic4_8s/Manifest300.mpd",
+                    "name": "Low Latency (Single-Rate) (livesim-chunked)",
+                    "bufferConfig": {
+                        "lowLatencyMode": true,
+                        "liveDelay": 4
+                    },
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://livesim.dashif.org/livesim-chunked/chunkdur_1/ato_7/testpic4_8s/Manifest.mpd",
+                    "name": "Low Latency (Multi-Rate) (livesim-chunked)",
+                    "bufferConfig": {
+                        "lowLatencyMode": true,
+                        "liveDelay": 4
+                    },
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://live.unified-streaming.com/scte35/scte35.isml/.mpd",
+                    "name": "Unified Streaming reference stream with scte35 markers",
+                    "moreInfo": "http://demo.unified-streaming.com/features.html",
+                    "provider": "unified"
+                },
+                {
+                    "url": "https://akamaibroadcasteruseast.akamaized.net/cmaf/live/657078/akasource/out.mpd",
+                    "name": "Low Latency Stream",
+                    "bufferConfig": {
+                        "lowLatencyMode": true,
+                        "liveDelay": 3
+                    },
+                    "provider": "akamai"
+                },
+                {
+                    "name": "Clear Dynamic SegmentTimeline",
+                    "url": "//wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvtime.mpd",
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Clear Dynamic SegmentTemplate",
+                    "url": "//wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvnumber.mpd",
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Clear Dynamic SegmentList",
+                    "url": "//wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvlist.mpd",
+                    "provider": "wowza"
+                }
+            ]
+        },
+        {
+            "name": "Subtitles and Captions",
+            "submenu": [
+                {
+                    "url": "https://dash.akamaized.net/akamai/test/caption_test/ElephantsDream/elephants_dream_480p_heaac5_1.mpd",
+                    "name": "External VTT subtitle file",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "TTML Segmented Subtitles VoD",
+                    "url": "https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "TTML Segmented Subtitles Live (livesim)",
+                    "url": "https://livesim.dashif.org/livesim/testpic_2s/multi_subs.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "TTML Sideloaded XML Subtitles",
+                    "url": "https://livesim.dashif.org/dash/vod/testpic_2s/xml_subs.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Embedded CEA-608 Closed Captions",
+                    "url": "https://livesim.dashif.org/dash/vod/testpic_2s/cea608.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Embedded CEA-608 Closed Captions (livesim)",
+                    "url": "https://livesim.dashif.org/livesim/testpic_2s/cea608.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Embedded CEA-608 Closed Captions and TTML segments VoD",
+                    "url": "https://livesim.dashif.org/dash/vod/testpic_2s/cea608_and_segs.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Embedded CEA-608 Closed Captions and TTML segments Live (livesim)",
+                    "url": "https://livesim.dashif.org/livesim/testpic_2s/cea608_and_segs.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "url": "https://livesim.dashif.org/dash/vod/testpic_2s/imsc1_img.mpd",
+                    "name": "IMSC1 (CMAF) Image Subtitles",
+                    "moreInfo": "https://livesim.dashif.org/dash/vod/testpic_2s/imsc1_img_subs_info.html",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "TTML Image Subtitles embedded (VoD)",
+                    "url": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs.mpd",
+                    "moreInfo": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs_info.html",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "TTML Segmented 'snaking' subtitles (with random text) (Ondemand)",
+                    "url": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/1/client_manifest-snake.mpd",
+                    "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/",
+                    "provider": "bbc"
+                },
+                {
+                    "name": "BBC R&D EBU-TT-D Subtitling Test",
+                    "url": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/1/client_manifest-all.mpd",
+                    "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/",
+                    "provider": "bbc"
+                },
+                {
+                    "url": "https://dash.akamaized.net/dash264/CTA/imsc1/IT1-20171027_dash.mpd",
+                    "name": "IMSC1 Text Subtitles via sidecar file",
+                    "provider": "cta"
+                }
+            ]
+        },
+        {
+            "name": "DRM (modern)",
+            "submenu": [
+                {
+                    "name": "1080p with Widevine DRM, license expired after 60s",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImZpcnN0X3BsYXlfZXhwaXJhdGlvbiI6NjAsInBsYXlyZWFkeSI6eyJyZWFsX3RpbWVfZXhwaXJhdGlvbiI6dHJ1ZX0sImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.FAbIiPxX8BHi9RwfzD7Yn-wugU19ghrkBFKsaCPrZmU"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "1080p with PlayReady and Widevine DRM, single key",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "1080p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_1080p.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "1080p with W3C Clear Key, single key",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "1080p with W3C Clear Key, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_1080p_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
+                                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
+                                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
+                                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
+                                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "2160p with PlayReady and Widevine DRM, single key",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "2160p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "2160p with W3C Clear Key, single key",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "2160p with W3C Clear Key, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
+                                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
+                                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
+                                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
+                                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Audio with PlayReady and Widevine DRM, single key",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_AudioOnly.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Audio with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_AudioOnly.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Audio with W3C Clear Key, single key",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_AudioOnly_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Audio with W3C Clear Key, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_AudioOnly_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
+                                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
+                                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
+                                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
+                                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 1080p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 1080p with W3C Clear Key, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "CHJ4bvnnRl-jok5bDvj6RQ": "wyYRebq2Hu7JedLUBpURzw",
+                                "wU8HCfK5RCeRa2G1JYZQag": "7fsXeXJHs8enQ0SEfkhTBQ",
+                                "LW6Th2DKQUWuwsQIN7SwJg": "QtC_8bYPe-SfF9YDSE0MuQ",
+                                "3gLwf6CYTuC1VpB8DRf7vA": "GQnGyyKBez4x8aNTD6cNzw",
+                                "kU5p9AqzRTSen5hTYV4m9g": "0DBllUYESc5WdSJMebqlBA",
+                                "KfBej6GuRuSA6SLc1EzXoQ": "BxGxfISpDLtBCXJkyQG3Mg",
+                                "af5wd9rdS1WWzcPts5kYUw": "7TqCUJKmSlCbdIeJ0xbAgQ"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 2160p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 2160p with W3C Clear Key, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "CHJ4bvnnRl-jok5bDvj6RQ": "wyYRebq2Hu7JedLUBpURzw",
+                                "wU8HCfK5RCeRa2G1JYZQag": "7fsXeXJHs8enQ0SEfkhTBQ",
+                                "LW6Th2DKQUWuwsQIN7SwJg": "QtC_8bYPe-SfF9YDSE0MuQ",
+                                "3gLwf6CYTuC1VpB8DRf7vA": "GQnGyyKBez4x8aNTD6cNzw",
+                                "kU5p9AqzRTSen5hTYV4m9g": "0DBllUYESc5WdSJMebqlBA",
+                                "KfBej6GuRuSA6SLc1EzXoQ": "BxGxfISpDLtBCXJkyQG3Mg",
+                                "af5wd9rdS1WWzcPts5kYUw": "7TqCUJKmSlCbdIeJ0xbAgQ"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period audio with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_AudioOnly.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period audio with W3C Clear Key, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_AudioOnly_ClearKey.mpd",
+                    "protData": {
+                        "org.w3.clearkey": {
+                            "clearkeys": {
+                                "CHJ4bvnnRl-jok5bDvj6RQ": "wyYRebq2Hu7JedLUBpURzw",
+                                "wU8HCfK5RCeRa2G1JYZQag": "7fsXeXJHs8enQ0SEfkhTBQ",
+                                "LW6Th2DKQUWuwsQIN7SwJg": "QtC_8bYPe-SfF9YDSE0MuQ",
+                                "3gLwf6CYTuC1VpB8DRf7vA": "GQnGyyKBez4x8aNTD6cNzw",
+                                "kU5p9AqzRTSen5hTYV4m9g": "0DBllUYESc5WdSJMebqlBA",
+                                "KfBej6GuRuSA6SLc1EzXoQ": "BxGxfISpDLtBCXJkyQG3Mg",
+                                "af5wd9rdS1WWzcPts5kYUw": "7TqCUJKmSlCbdIeJ0xbAgQ"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Complex multi-period with different content, encrypted",
+                    "url": "https://media.axprod.net/TestVectors/v8-MultiContent/Encrypted/Manifest.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXNzYWdlIjp7InBsYXlyZWFkeSI6eyJtaW5fYXBwX3NlY3VyaXR5X2xldmVsIjoxNTAsInBsYXlfZW5hYmxlcnMiOlsiNzg2NjI3RDgtQzJBNi00NEJFLThGODgtMDhBRTI1NUIwMUE3Il19LCJrZXlzIjpbeyJlbmNyeXB0ZWRfa2V5IjoiN1hIS21uL3NmdnVQTFd0UHRHVFpEUT09IiwiaWQiOiIxZWIzMzJiMi03NDM3LTQ5YWUtYmYzOS1lNzAwMTBjYjYyMGIifSx7ImVuY3J5cHRlZF9rZXkiOiJzUXRGWDh6Y2o5bEVyZ282RDdjNGh3PT0iLCJpZCI6IjlhYTYwZTNhLTljOTEtNDc0ZC04OTM3LTdkOGIzMjU5Y2NjZCJ9LHsiZW5jcnlwdGVkX2tleSI6Im8wUlY0a2tuVE1KTFFkeVh1a1VlT2c9PSIsImlkIjoiNTk0Nzk3YTctNmIwMC00NjczLWIyZTEtYWVmYzU1MmIxYmJjIn0seyJlbmNyeXB0ZWRfa2V5IjoiZVl1dlIvS1BhWCtXWG43Rkw5WkNxQT09IiwiaWQiOiJhYWUyNTc1OC1lNDgxLTQ4OTUtODEzMy1iODA5NDgzMzkzZDAifSx7ImVuY3J5cHRlZF9rZXkiOiIwQ1BUWVpMWmk1SmhZZ0NiZThKTnhRPT0iLCJpZCI6IjkzMTEzZDVlLTJlYzgtNDNjMS05MDgzLTEwZjNkZTIwM2EyOSJ9LHsiZW5jcnlwdGVkX2tleSI6IlFQUlBrQ09tenNORkl1cCszSFp3WWc9PSIsImlkIjoiZTQ4NzcwMzctNDM3Ni00ZWRkLTg1ODYtMTQ1MTk0MzU4ODAzIn0seyJlbmNyeXB0ZWRfa2V5IjoiVWtrWUZ0TXJGMnlET0hvYWxKRmZSZz09IiwiaWQiOiJlOGFkNTk3Mi04ODE5LTQzMjYtYWQ2YS1mOWExNTE2OGJjYTcifSx7ImVuY3J5cHRlZF9rZXkiOiJkdWhnRVJSRkRiZlFEcnlwUWRCUUVRPT0iLCJpZCI6IjI2YTA5MzlmLTNhMGMtNDI4OS1hZDZiLWJiNWNlYzE3ZmY0MCJ9LHsiZW5jcnlwdGVkX2tleSI6IjFOUHp1Q1JLM3p4bWpYK3FZZnU1bXc9PSIsImlkIjoiYTVlZDcxNzMtMzc4MS00Yzc0LTkwYWMtZjA4MzRlZjFhMWM4In0seyJlbmNyeXB0ZWRfa2V5IjoiYXVQTEJjd2NmTnFSRTV1WFdUZ1NLUT09IiwiaWQiOiIzMjlmNTMzZS1mYTc3LTQwNzAtYjY1Yi0zOTI5ODBiYWRhMGQifSx7ImVuY3J5cHRlZF9rZXkiOiI2NkE1MnFiZEcyQlg3SUhTaml6WUpRPT0iLCJpZCI6IjE5N2Y4Yjg0LTNiZjItNDg2MC1iMjNhLTVjNTQ2MjhhZDBiMSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhIUUE3WWlEZGZwTE05QWxwcklDK2c9PSIsImlkIjoiNGVjZGQ0YzctNGQyOS00M2ZmLWJkYWYtMDJiNzY5MDBmMTIzIn0seyJlbmNyeXB0ZWRfa2V5IjoiblBqNWl3N1IvZDR0WmdKZktoRFhYZz09IiwiaWQiOiJlZTc0NmQxMi1hNDg4LTQ5NzctYjFjYS03N2ExMDFiYjQ4M2MifSx7ImVuY3J5cHRlZF9rZXkiOiJ5U1Vma0Q5ZEliK0ExNmoydHNzNDV3PT0iLCJpZCI6IjQ5NGY5NmUxLTM1MzUtNGE4NC05MWMxLWZhYTI4M2IwNmE1NCJ9LHsiZW5jcnlwdGVkX2tleSI6InJlUHVsaXg0eFZNZHlsUnVpcG5FK0E9PSIsImlkIjoiNWMwN2JmZjQtYzcwYi00ZDAyLWEzNzgtMzgzMjZmOTEwMDBjIn0seyJlbmNyeXB0ZWRfa2V5Ijoialc3Z2E0aytMcDdxWTd4Zmo5dHB5Zz09IiwiaWQiOiIzMjgzYzM1ZS1hZTJjLTRmOGMtOGE0OS00YTc1MGFlZGYxNDIifSx7ImVuY3J5cHRlZF9rZXkiOiJLdHNNYlZRM0JXL1dwQlIwSlQwa2R3PT0iLCJpZCI6IjhkNzdiOWM0LTdmNmQtNDdmOS04NTYyLWE1ZTVlNGMzNTFjZSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhRTGZKQUpmSjFyelFMZGNFRWM5L2c9PSIsImlkIjoiODIzMTcxZDctZGZjMS00ZDBlLTgwM2YtNDBhMWY1ZTQzODY4In0seyJlbmNyeXB0ZWRfa2V5IjoiR0hQSVNYTXZKWEJ6WktGQm1ZMXFCZz09IiwiaWQiOiJjMTYyYWM3ZC00MGQ3LTQ2YzAtYjJjZC1lOTQyN2Q0MzljMzIifSx7ImVuY3J5cHRlZF9rZXkiOiJ2bzJhamlLaWV6Yk9xY2tyNTN0U3B3PT0iLCJpZCI6ImZhYTZkNmY1LTM1MDEtNDg1MS05MmViLWM3ZGE0NDRlY2FhYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ijg2QkEwUHYwYXk4UmV5Wk4zeElYa2c9PSIsImlkIjoiZmM0OWI3MTEtMWNiNi00MGE3LTk4NDAtODNjNDFiNTViOTliIn0seyJlbmNyeXB0ZWRfa2V5IjoibUhBbERaa0NYQWpCR1pLR2h0Y3Zpdz09IiwiaWQiOiI0M2QwMjIwNC04NjA5LTRkNDYtOTlhYy00MjVhNWI0ODAwOTgifSx7ImVuY3J5cHRlZF9rZXkiOiJ3bWhjREdZcG84YlZBSit0OGF4SUZnPT0iLCJpZCI6IjRkNmU0OTZhLTFmOTgtNGVlOC04Zjg3LTRiMTAzYmQzOGQwZiJ9LHsiZW5jcnlwdGVkX2tleSI6Ik92cWF3Y0JVQVE3cHM2T0xhSnZPRmc9PSIsImlkIjoiYzRlMGQ5ZjctZDQ4Mi00MWMzLThjYmItOTdiMTEyZDcyZTY2In0seyJlbmNyeXB0ZWRfa2V5IjoiM3dTMkdpemxWcGtuNDlRRExxcFBhZz09IiwiaWQiOiIxYzJkZTFlNC1lZDMwLTQ0NTItYTExNS0wOTIzYjk0MGM0ZWQifSx7ImVuY3J5cHRlZF9rZXkiOiJTNWRGQ25yRUNjREswOEVreHllY3lRPT0iLCJpZCI6ImRjZjQzODVmLTM1MDUtNGZmNS1iMDU1LTQ2MWQ1YTA3ZjBmNSJ9LHsiZW5jcnlwdGVkX2tleSI6IlBnRUhyK0Nrd3JYTStlSWFnUnl4b3c9PSIsImlkIjoiZjMyNGYwNGUtN2M3My00ZjM3LTgxMzUtYzg5ZjhjNGU2Y2Y0In0seyJlbmNyeXB0ZWRfa2V5IjoiSkx6UUZGMXp4MFpZMzZYSTdaR0VaUT09IiwiaWQiOiI1Y2I1M2RkOC0xMjk0LTRjOGUtOTY0ZS0yNTg2OWQ1M2EyNGEifSx7ImVuY3J5cHRlZF9rZXkiOiJVOHBRdW1HUmtrTGppSEg1cjlqWGhnPT0iLCJpZCI6IjA1NjgyYTI2LTg4NzctNDZkMy05NDY1LTEwNGEzYTQwMDEwYSJ9LHsiZW5jcnlwdGVkX2tleSI6IlVJTDZKNGRzZEpGNi9tQTM1dHIvVFE9PSIsImlkIjoiYmNlNTM0MTAtM2IwYy00OTE0LTg3YTMtNzIzNjNjYTE3NTMxIn0seyJlbmNyeXB0ZWRfa2V5IjoiM3pCaW1Dc2NlMTV2YkV0Mm8zNEhhUT09IiwiaWQiOiI0ZjRmOGExYy0zMjAyLTQ2YWUtODA5ZS00ZmNmOTMzZWU2NTQifSx7ImVuY3J5cHRlZF9rZXkiOiJDVHdTU3RQMnV1QjVZdStNUGpZY29RPT0iLCJpZCI6Ijg1MmNkN2Y3LTQwZTktNDgyZC04MjI1LWRjYmM4ZTA4ZGI4YiJ9LHsiZW5jcnlwdGVkX2tleSI6Im1ubXRuUWVHYm0rZUEzN2t6dFovRVE9PSIsImlkIjoiZWZkZGI4ZWUtODI3OC00NDM2LWE2OTgtNzJiODAzZDA1MGRiIn0seyJlbmNyeXB0ZWRfa2V5Ijoib3BicXltZVRiT3VWalJnYjJHMHpVdz09IiwiaWQiOiJkNWJkYmE1My02MDZmLTRkNDYtODg4ZC1hMWViNDRjZDVmNDEifSx7ImVuY3J5cHRlZF9rZXkiOiJiSWRsOFhoVmdobmc4Tis4cUZVbFRnPT0iLCJpZCI6ImFlZDQ5NjA5LTUwOTktNDExOC05YjA4LWI5NTM4ZGIwMGMwYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ikp1SS9UMSt5cUtzUU95MjZEbzRuZmc9PSIsImlkIjoiN2I1YzFlOWYtZjhiOC00OTkyLWFhM2UtYTA4NWZjMzY3MzExIn0seyJlbmNyeXB0ZWRfa2V5IjoiM2ladUZxalh3bzhiN1lkamxKZUVPUT09IiwiaWQiOiI1YmU0MGViZi0yZWE0LTQ5ZmItYjZlYy1iMDlkZTVhYjYxN2YifSx7ImVuY3J5cHRlZF9rZXkiOiJoQ3gybzJxQlJKL2hiZVNqKzY5dHF3PT0iLCJpZCI6ImU1MzBkZjFiLWZmN2UtNDJhNC1iNTNhLThkNmRlNjhmMDAxMCJ9LHsiZW5jcnlwdGVkX2tleSI6IjhveWlGM0pQTmdzd0tPajVrWjVIT0E9PSIsImlkIjoiYjk0OTg3NDUtODJlYS00ZmZhLWFiMmItZDczN2VmNTRmODYzIn0seyJlbmNyeXB0ZWRfa2V5IjoiTEs4TENTY28zQmZYZXhLMlh0WUZSQT09IiwiaWQiOiI0ZjUyOTc1Yi1lOWYzLTRmZDctYmI4OS00MDNiMjgwMGU4Y2YifV0sInR5cGUiOiJlbnRpdGxlbWVudF9tZXNzYWdlIn0sImNvbV9rZXlfaWQiOiJiMzM2NGViNS01MWY2LTRhZTMtOGM5OC0zM2NlZDVlMzFjNzgiLCJ2ZXJzaW9uIjoxfQ.kuZip7wOBZ6-FjAO_VcBq0r816426dFK4fTdfm99NqE"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXNzYWdlIjp7InBsYXlyZWFkeSI6eyJtaW5fYXBwX3NlY3VyaXR5X2xldmVsIjoxNTAsInBsYXlfZW5hYmxlcnMiOlsiNzg2NjI3RDgtQzJBNi00NEJFLThGODgtMDhBRTI1NUIwMUE3Il19LCJrZXlzIjpbeyJlbmNyeXB0ZWRfa2V5IjoiN1hIS21uL3NmdnVQTFd0UHRHVFpEUT09IiwiaWQiOiIxZWIzMzJiMi03NDM3LTQ5YWUtYmYzOS1lNzAwMTBjYjYyMGIifSx7ImVuY3J5cHRlZF9rZXkiOiJzUXRGWDh6Y2o5bEVyZ282RDdjNGh3PT0iLCJpZCI6IjlhYTYwZTNhLTljOTEtNDc0ZC04OTM3LTdkOGIzMjU5Y2NjZCJ9LHsiZW5jcnlwdGVkX2tleSI6Im8wUlY0a2tuVE1KTFFkeVh1a1VlT2c9PSIsImlkIjoiNTk0Nzk3YTctNmIwMC00NjczLWIyZTEtYWVmYzU1MmIxYmJjIn0seyJlbmNyeXB0ZWRfa2V5IjoiZVl1dlIvS1BhWCtXWG43Rkw5WkNxQT09IiwiaWQiOiJhYWUyNTc1OC1lNDgxLTQ4OTUtODEzMy1iODA5NDgzMzkzZDAifSx7ImVuY3J5cHRlZF9rZXkiOiIwQ1BUWVpMWmk1SmhZZ0NiZThKTnhRPT0iLCJpZCI6IjkzMTEzZDVlLTJlYzgtNDNjMS05MDgzLTEwZjNkZTIwM2EyOSJ9LHsiZW5jcnlwdGVkX2tleSI6IlFQUlBrQ09tenNORkl1cCszSFp3WWc9PSIsImlkIjoiZTQ4NzcwMzctNDM3Ni00ZWRkLTg1ODYtMTQ1MTk0MzU4ODAzIn0seyJlbmNyeXB0ZWRfa2V5IjoiVWtrWUZ0TXJGMnlET0hvYWxKRmZSZz09IiwiaWQiOiJlOGFkNTk3Mi04ODE5LTQzMjYtYWQ2YS1mOWExNTE2OGJjYTcifSx7ImVuY3J5cHRlZF9rZXkiOiJkdWhnRVJSRkRiZlFEcnlwUWRCUUVRPT0iLCJpZCI6IjI2YTA5MzlmLTNhMGMtNDI4OS1hZDZiLWJiNWNlYzE3ZmY0MCJ9LHsiZW5jcnlwdGVkX2tleSI6IjFOUHp1Q1JLM3p4bWpYK3FZZnU1bXc9PSIsImlkIjoiYTVlZDcxNzMtMzc4MS00Yzc0LTkwYWMtZjA4MzRlZjFhMWM4In0seyJlbmNyeXB0ZWRfa2V5IjoiYXVQTEJjd2NmTnFSRTV1WFdUZ1NLUT09IiwiaWQiOiIzMjlmNTMzZS1mYTc3LTQwNzAtYjY1Yi0zOTI5ODBiYWRhMGQifSx7ImVuY3J5cHRlZF9rZXkiOiI2NkE1MnFiZEcyQlg3SUhTaml6WUpRPT0iLCJpZCI6IjE5N2Y4Yjg0LTNiZjItNDg2MC1iMjNhLTVjNTQ2MjhhZDBiMSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhIUUE3WWlEZGZwTE05QWxwcklDK2c9PSIsImlkIjoiNGVjZGQ0YzctNGQyOS00M2ZmLWJkYWYtMDJiNzY5MDBmMTIzIn0seyJlbmNyeXB0ZWRfa2V5IjoiblBqNWl3N1IvZDR0WmdKZktoRFhYZz09IiwiaWQiOiJlZTc0NmQxMi1hNDg4LTQ5NzctYjFjYS03N2ExMDFiYjQ4M2MifSx7ImVuY3J5cHRlZF9rZXkiOiJ5U1Vma0Q5ZEliK0ExNmoydHNzNDV3PT0iLCJpZCI6IjQ5NGY5NmUxLTM1MzUtNGE4NC05MWMxLWZhYTI4M2IwNmE1NCJ9LHsiZW5jcnlwdGVkX2tleSI6InJlUHVsaXg0eFZNZHlsUnVpcG5FK0E9PSIsImlkIjoiNWMwN2JmZjQtYzcwYi00ZDAyLWEzNzgtMzgzMjZmOTEwMDBjIn0seyJlbmNyeXB0ZWRfa2V5Ijoialc3Z2E0aytMcDdxWTd4Zmo5dHB5Zz09IiwiaWQiOiIzMjgzYzM1ZS1hZTJjLTRmOGMtOGE0OS00YTc1MGFlZGYxNDIifSx7ImVuY3J5cHRlZF9rZXkiOiJLdHNNYlZRM0JXL1dwQlIwSlQwa2R3PT0iLCJpZCI6IjhkNzdiOWM0LTdmNmQtNDdmOS04NTYyLWE1ZTVlNGMzNTFjZSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhRTGZKQUpmSjFyelFMZGNFRWM5L2c9PSIsImlkIjoiODIzMTcxZDctZGZjMS00ZDBlLTgwM2YtNDBhMWY1ZTQzODY4In0seyJlbmNyeXB0ZWRfa2V5IjoiR0hQSVNYTXZKWEJ6WktGQm1ZMXFCZz09IiwiaWQiOiJjMTYyYWM3ZC00MGQ3LTQ2YzAtYjJjZC1lOTQyN2Q0MzljMzIifSx7ImVuY3J5cHRlZF9rZXkiOiJ2bzJhamlLaWV6Yk9xY2tyNTN0U3B3PT0iLCJpZCI6ImZhYTZkNmY1LTM1MDEtNDg1MS05MmViLWM3ZGE0NDRlY2FhYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ijg2QkEwUHYwYXk4UmV5Wk4zeElYa2c9PSIsImlkIjoiZmM0OWI3MTEtMWNiNi00MGE3LTk4NDAtODNjNDFiNTViOTliIn0seyJlbmNyeXB0ZWRfa2V5IjoibUhBbERaa0NYQWpCR1pLR2h0Y3Zpdz09IiwiaWQiOiI0M2QwMjIwNC04NjA5LTRkNDYtOTlhYy00MjVhNWI0ODAwOTgifSx7ImVuY3J5cHRlZF9rZXkiOiJ3bWhjREdZcG84YlZBSit0OGF4SUZnPT0iLCJpZCI6IjRkNmU0OTZhLTFmOTgtNGVlOC04Zjg3LTRiMTAzYmQzOGQwZiJ9LHsiZW5jcnlwdGVkX2tleSI6Ik92cWF3Y0JVQVE3cHM2T0xhSnZPRmc9PSIsImlkIjoiYzRlMGQ5ZjctZDQ4Mi00MWMzLThjYmItOTdiMTEyZDcyZTY2In0seyJlbmNyeXB0ZWRfa2V5IjoiM3dTMkdpemxWcGtuNDlRRExxcFBhZz09IiwiaWQiOiIxYzJkZTFlNC1lZDMwLTQ0NTItYTExNS0wOTIzYjk0MGM0ZWQifSx7ImVuY3J5cHRlZF9rZXkiOiJTNWRGQ25yRUNjREswOEVreHllY3lRPT0iLCJpZCI6ImRjZjQzODVmLTM1MDUtNGZmNS1iMDU1LTQ2MWQ1YTA3ZjBmNSJ9LHsiZW5jcnlwdGVkX2tleSI6IlBnRUhyK0Nrd3JYTStlSWFnUnl4b3c9PSIsImlkIjoiZjMyNGYwNGUtN2M3My00ZjM3LTgxMzUtYzg5ZjhjNGU2Y2Y0In0seyJlbmNyeXB0ZWRfa2V5IjoiSkx6UUZGMXp4MFpZMzZYSTdaR0VaUT09IiwiaWQiOiI1Y2I1M2RkOC0xMjk0LTRjOGUtOTY0ZS0yNTg2OWQ1M2EyNGEifSx7ImVuY3J5cHRlZF9rZXkiOiJVOHBRdW1HUmtrTGppSEg1cjlqWGhnPT0iLCJpZCI6IjA1NjgyYTI2LTg4NzctNDZkMy05NDY1LTEwNGEzYTQwMDEwYSJ9LHsiZW5jcnlwdGVkX2tleSI6IlVJTDZKNGRzZEpGNi9tQTM1dHIvVFE9PSIsImlkIjoiYmNlNTM0MTAtM2IwYy00OTE0LTg3YTMtNzIzNjNjYTE3NTMxIn0seyJlbmNyeXB0ZWRfa2V5IjoiM3pCaW1Dc2NlMTV2YkV0Mm8zNEhhUT09IiwiaWQiOiI0ZjRmOGExYy0zMjAyLTQ2YWUtODA5ZS00ZmNmOTMzZWU2NTQifSx7ImVuY3J5cHRlZF9rZXkiOiJDVHdTU3RQMnV1QjVZdStNUGpZY29RPT0iLCJpZCI6Ijg1MmNkN2Y3LTQwZTktNDgyZC04MjI1LWRjYmM4ZTA4ZGI4YiJ9LHsiZW5jcnlwdGVkX2tleSI6Im1ubXRuUWVHYm0rZUEzN2t6dFovRVE9PSIsImlkIjoiZWZkZGI4ZWUtODI3OC00NDM2LWE2OTgtNzJiODAzZDA1MGRiIn0seyJlbmNyeXB0ZWRfa2V5Ijoib3BicXltZVRiT3VWalJnYjJHMHpVdz09IiwiaWQiOiJkNWJkYmE1My02MDZmLTRkNDYtODg4ZC1hMWViNDRjZDVmNDEifSx7ImVuY3J5cHRlZF9rZXkiOiJiSWRsOFhoVmdobmc4Tis4cUZVbFRnPT0iLCJpZCI6ImFlZDQ5NjA5LTUwOTktNDExOC05YjA4LWI5NTM4ZGIwMGMwYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ikp1SS9UMSt5cUtzUU95MjZEbzRuZmc9PSIsImlkIjoiN2I1YzFlOWYtZjhiOC00OTkyLWFhM2UtYTA4NWZjMzY3MzExIn0seyJlbmNyeXB0ZWRfa2V5IjoiM2ladUZxalh3bzhiN1lkamxKZUVPUT09IiwiaWQiOiI1YmU0MGViZi0yZWE0LTQ5ZmItYjZlYy1iMDlkZTVhYjYxN2YifSx7ImVuY3J5cHRlZF9rZXkiOiJoQ3gybzJxQlJKL2hiZVNqKzY5dHF3PT0iLCJpZCI6ImU1MzBkZjFiLWZmN2UtNDJhNC1iNTNhLThkNmRlNjhmMDAxMCJ9LHsiZW5jcnlwdGVkX2tleSI6IjhveWlGM0pQTmdzd0tPajVrWjVIT0E9PSIsImlkIjoiYjk0OTg3NDUtODJlYS00ZmZhLWFiMmItZDczN2VmNTRmODYzIn0seyJlbmNyeXB0ZWRfa2V5IjoiTEs4TENTY28zQmZYZXhLMlh0WUZSQT09IiwiaWQiOiI0ZjUyOTc1Yi1lOWYzLTRmZDctYmI4OS00MDNiMjgwMGU4Y2YifV0sInR5cGUiOiJlbnRpdGxlbWVudF9tZXNzYWdlIn0sImNvbV9rZXlfaWQiOiJiMzM2NGViNS01MWY2LTRhZTMtOGM5OC0zM2NlZDVlMzFjNzgiLCJ2ZXJzaW9uIjoxfQ.kuZip7wOBZ6-FjAO_VcBq0r816426dFK4fTdfm99NqE"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    }
+                },
+                {
+                    "name": "Microsoft AZURE MEDIA SERVICES ON DEMAND H264 AAC 4K CENC PLAYREADY 2.0",
+                    "url": "https://profficialsite.origin.mediaservices.windows.net/c51358ea-9a5e-4322-8951-897d640fdfd7/tearsofsteel_4k.ism/manifest(format=mpd-time-csf)",
+                    "protData": {
+                        "com.microsoft.playready": {
+                            "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx"
+                        }
+                    },
+                    "provider": "microsoft"
+                },
+                {
+                    "name": "Microsoft AZURE MEDIA SERVICES ON DEMAND H264 AAC 4K CENC PLAYREADY 2.0 (persistent)",
+                    "url": "https://profficialsite.origin.mediaservices.windows.net/c51358ea-9a5e-4322-8951-897d640fdfd7/tearsofsteel_4k.ism/manifest(format=mpd-time-csf)",
+                    "protData": {
+                        "com.microsoft.playready": {
+                            "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(persist:true,sl:150)",
+                            "sessionType": "persistent-license"
+                        }
+                    },
+                    "provider": "microsoft"
+                },
+                {
+                    "name": "Source: XBox One commercial video",
+                    "url": "https://profficialsite.origin.mediaservices.windows.net/9cc5e871-68ec-42c2-9fc7-fda95521f17d/dayoneplayready.ism/manifest(format=mpd-time-csf)",
+                    "protData": {
+                        "com.microsoft.playready": {
+                            "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx"
+                        }
+                    },
+                    "provider": "microsoft"
+                },
+                {
+                    "name": "AZURE MEDIA SERVICES LIVE PLAYREADY 2.0",
+                    "url": "https://profficialsite.origin.mediaservices.windows.net/9cc5e871-68ec-42c2-9fc7-fda95521f17d/dayoneplayready.ism/manifest(format=mpd-time-csf)",
+                    "protData": {
+                        "com.microsoft.playready": {
+                            "serverURL": "https://test.playready.microsoft.com/service/rightsmanager.asmx"
+                        }
+                    },
+                    "provider": "microsoft"
+                },
+                {
+                    "name": "Unified Streaming (Widevine, persistent)",
+                    "url": "//demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-dash-widevine.ism/.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://cwip-shaka-proxy.appspot.com/no_auth",
+                            "sessionType": "persistent-license"
+                        }
+                    },
+                    "provider": "unified"
+                },
+                {
+                    "name": "Widevine Dynamic SegmentTimeline",
+                    "url": "https://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvtime.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://widevine-proxy.appspot.com/proxy"
+                        }
+                    },
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Widevine Dynamic SegmentTemplate",
+                    "url": "https://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvnumber.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://widevine-proxy.appspot.com/proxy"
+                        }
+                    },
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Widevine Dynamic SegmentList",
+                    "url": "https://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvlist.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://widevine-proxy.appspot.com/proxy"
+                        }
+                    },
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Widevine Static SegmentTimeline",
+                    "url": "https://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvtime.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://widevine-proxy.appspot.com/proxy"
+                        }
+                    },
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Widevine Static SegmentTemplate",
+                    "url": "https://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvnumber.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://widevine-proxy.appspot.com/proxy"
+                        }
+                    },
+                    "provider": "wowza"
+                },
+                {
+                    "name": "Widevine Static SegmentList",
+                    "url": "https://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvlist.mpd ",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://widevine-proxy.appspot.com/proxy"
+                        }
+                    },
+                    "provider": "wowza"
+                }
+            ]
+        },
+        {
+            "name": "DRM Content (conservative/legacy)",
+            "submenu": [
+                {
+                    "name": "1080p with PlayReady and Widevine DRM, single key",
+                    "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM/Manifest_1080p.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
+                            },
+                            "httpTimeout": 5000,
+                            "audioRobustness": "SW_SECURE_CRYPTO",
+                            "videoRobustness": "SW_SECURE_DECODE"
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
+                            }
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "1080p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey/Manifest_1080p.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "2160p with PlayReady and Widevine DRM, single key",
+                    "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM/Manifest.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "2160p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey/Manifest.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 1080p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period 2160p with PlayReady and Widevine DRM, multiple keys",
+                    "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey-MultiPeriod/Manifest.mpd",
+                    "protData": {
+                        "com.widevine.alpha": {
+                            "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
+                            },
+                            "httpTimeout": 5000
+                        },
+                        "com.microsoft.playready": {
+                            "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
+                            "httpRequestHeaders": {
+                                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
+                            },
+                            "httpTimeout": 5000
+                        }
+                    },
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative",
+                    "provider": "axinom"
+                }
+            ]
+        },
+        {
+            "name": "Thumbnails",
+            "submenu": [
+                {
+                    "name": "Single adaption set, 7 tiles at 10x1, each thumb 320x180",
+                    "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_tiled_thumbnails.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Single adaption set, 4 tiles at 10x1, each thumb 205x115",
+                    "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_4_tiles_thumbnails.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Single adaption set, 1 tile at 10x20, each thumb 102x58",
+                    "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_tiled_thumbnails_2.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Two adaption sets with different thumb resolutions",
+                    "url": "//dash.akamaized.net/akamai/bbb_30fps/bbb_with_multiple_tiled_thumbnails.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "Live stream, Single adaptation set, 1x1 tiles (livesim)",
+                    "url": "//livesim.dashif.org/livesim/testpic_2s/Manifest_thumbs.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "SegmentBase, Single adaption set, 3x4 tiles",
+                    "url": "https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-tiled-thumbnails-static.mpd",
+                    "provider": "unified"
+                },
+                {
+                    "name": "SegmentTemplate with SegmentTimeline",
+                    "url": "https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-tiled-thumbnails-timeline.ism/.mpd",
+                    "provider": "unified"
+                },
+                {
+                    "name": "SegmentNumber",
+                    "url": "https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-tiled-thumbnails-numbered.ism/.mpd",
+                    "provider": "unified"
+                }
+            ]
+        },
+        {
+            "name": "Audio-only",
+            "submenu": [
+                {
+                    "name": "48k AAC-LC Stereo Beeps (Live)",
+                    "url": "https://livesim.dashif.org/livesim/testpic_2s/audio.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "48k AAC-LC Stereo Beeps (Ondemand)",
+                    "url": "https://livesim.dashif.org/dash/vod/testpic_2s/audio.mpd",
+                    "provider": "dashif"
+                },
+                {
+                    "name": "128k AAC-LC Stereo 1kHz Tone (Ondemand)",
+                    "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-audio-1kHz.mpd",
+                    "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/",
+                    "provider": "bbc"
+                },
+                {
+                    "name": "128k/320k AAC-LC Stereo/5.1 'Testcard' (Ondemand)",
+                    "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-audio.mpd",
+                    "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/",
+                    "provider": "bbc"
+                },
+                {
+                    "name": "Audio without encryption",
+                    "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_AudioOnly.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                },
+                {
+                    "name": "Multi-period audio without encryption",
+                    "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod_AudioOnly.mpd",
+                    "moreInfo": "https://github.com/Axinom/dash-test-vectors",
+                    "provider": "axinom"
+                }
+            ]
+        },
+        {
+            "name": "Smooth Streaming",
+            "submenu": [
+                {
+                    "url": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism/Manifest",
+                    "name": "Super Speedway",
+                    "provider": "microsoft"
+                },
+                {
+                    "url": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism/Manifest",
+                    "name": "Super Speedway + PlayReady DRM",
+                    "protData": {
+                        "com.microsoft.playready": {
+                        }
+                    },
+                    "provider": "microsoft"
+                },
+                {
+                    "url": "http://test.playready.microsoft.com/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism/Manifest",
+                    "name": "Super Speedway + PlayReady DRM (persistent)",
+                    "protData": {
+                        "com.microsoft.playready": {
+                            "serverURL": "http://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(persist:true,sl:150)",
+                            "sessionType": "persistent-license"
+                        }
+                    },
+                    "provider": "microsoft"
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }
diff --git a/samples/dash-if-reference-player/dashjs_config.json b/samples/dash-if-reference-player/dashjs_config.json
index f9811a8386..5385eb4085 100644
--- a/samples/dash-if-reference-player/dashjs_config.json
+++ b/samples/dash-if-reference-player/dashjs_config.json
@@ -27,6 +27,7 @@
         "liveCatchUpMinDrift": 0.02,
         "liveCatchUpMaxDrift": 0,
         "liveCatchUpPlaybackRate": 0.5,
+        "liveCatchupLatencyThreshold": null,
         "lastBitrateCachingInfo": { "enabled": true, "ttl": 360000},
         "lastMediaSettingsCachingInfo": { "enabled": true, "ttl": 360000},
         "cacheLoadThresholds": {"video": 50, "audio": 5},
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index 40f5d56e18..9c5521de2e 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -239,8 +239,10 @@
                     <label class="options-label">Audio:</label>
                     <input type="text" class="form-control" placeholder="audio initial lang, e.g. 'en'" ng-model="initialSettings.audio">
                     <label class="options-label">Video:</label>
-                    <input type="text" class="form-control" placeholder="initial role, e.g. 'alternate'" ng-model="initialSettings.video">        <label class="options-label">Text:</label>
+                    <input type="text" class="form-control" placeholder="initial role, e.g. 'alternate'" ng-model="initialSettings.video">
+                    <label class="options-label">Text:</label>
                     <input type="text" class="form-control" placeholder="text initial lang, e.g. 'en'" ng-model="initialSettings.text">
+                    <input type="text" class="form-control" placeholder="text initial role, e.g. 'caption'" ng-model="initialSettings.textRole">
                     <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
                            title="Enable subtitle on loading text">
                         <input type="checkbox" id="enableTextAtLoading" ng-model="initialSettings.textEnabled">
diff --git a/samples/low-latency/index.html b/samples/low-latency/index.html
index 82e5e048ec..20b8dd5d4b 100644
--- a/samples/low-latency/index.html
+++ b/samples/low-latency/index.html
@@ -10,7 +10,7 @@
     <!--<script src="../../dist/dash.all.min.js"></script>-->
 
     <script class="code">
-        var player, targetLatency, minDrift, catchupPlaybackRate;
+        var player, targetLatency, minDrift, catchupPlaybackRate, liveCatchupLatencyThreshold;
 
         function init() {
             var video,
@@ -19,7 +19,7 @@
             video = document.querySelector("video");
             player = dashjs.MediaPlayer().create();
             player.initialize(video, url, true);
-            player.updateSettings({ 'streaming': { 'lowLatencyEnabled': true }});
+            player.updateSettings({'streaming': {'lowLatencyEnabled': true}});
 
             applyParameters();
 
@@ -30,12 +30,14 @@
             targetLatency = parseFloat(document.getElementById("target-latency").value, 10);
             minDrift = parseFloat(document.getElementById("min-drift").value, 10);
             catchupPlaybackRate = parseFloat(document.getElementById("catchup-playback-rate").value, 10);
+            liveCatchupLatencyThreshold = parseFloat(document.getElementById("catchup-threshold").value, 10);
 
             player.updateSettings({
                 'streaming': {
                     'liveDelay': targetLatency,
                     'liveCatchUpMinDrift': minDrift,
-                    'liveCatchUpPlaybackRate': catchupPlaybackRate
+                    'liveCatchUpPlaybackRate': catchupPlaybackRate,
+                    "liveCatchupLatencyThreshold": liveCatchupLatencyThreshold,
                 }
             });
         }
@@ -77,7 +79,7 @@
         }
 
         .help-container > div {
-            width: 33.3%;
+            width: 25.0%;
             padding: 1em;
             box-sizing: border-box;
         }
@@ -97,8 +99,12 @@
                     <fieldset>
                         <legend>Configurable parameters</legend>
                         <p>Target Latency (secs): <input type="number" id="target-latency" value="3" min="0"></p>
-                        <p>Min. drift (secs): <input type="number" id="min-drift" value="0.05" min="0.0" max="0.5" step="0.01"></p>
-                        <p>Catch-up playback rate (%): <input type="number" id="catchup-playback-rate" value="0.5" min="0.0" max="0.5" step="0.01"></p>
+                        <p>Min. drift (secs): <input type="number" id="min-drift" value="0.05" min="0.0" max="0.5"
+                                                     step="0.01"></p>
+                        <p>Catch-up playback rate (%): <input type="number" id="catchup-playback-rate" value="0.5"
+                                                              min="0.0" max="0.5" step="0.01"></p>
+                        <p>Live catchup latency threshold (secs): <input type="number" id="catchup-threshold" value="30">
+                        </p>
                         <button type="submit">Apply</button>
                     </fieldset>
                 </form>
@@ -110,6 +116,7 @@
                     <li>Latency: <span id="latency-tag"></span></li>
                     <li>Min. drift: <span id="mindrift-tag"></span></li>
                     <li>Playback rate: <span id="playbackrate-tag"></span></li>
+                    <li>Live catchup latency threshold : <span id="catchup-threshold-tag"></span></li>
                     <li>Buffer: <b><span id="buffer-tag"></span></b></li>
                 </ul>
             </fieldset>
@@ -120,20 +127,33 @@
     <div class="help-container">
         <div id="latency-help">
             <h3>Latency</h3>
-            <p>Lowering this value will lower latency but may decrease the player's ability to build a stable buffer.</p>
-            <p><a href="http://cdn.dashjs.org/latest/jsdoc/module-MediaPlayer.html#setLiveDelay__anchor" target="_blank">setLiveDelay() doc</a></p>
+            <p>Lowering this value will lower latency but may decrease the player's ability to build a stable
+                buffer.</p>
+            <p><a href="http://cdn.dashjs.org/latest/jsdoc/module-Settings.html#~StreamingSettings__anchor"
+                  target="_blank">setLiveDelay() doc</a></p>
         </div>
 
         <div id="min-drift-help">
             <h3>Min. drift</h3>
             <p>Minimum latency deviation allowed before activating catch-up mechanism.</p>
-            <p><a href="http://cdn.dashjs.org/latest/jsdoc/module-MediaPlayer.html#setLowLatencyMinDrift__anchor" target="_blank">setLowLatencyMinDrift() doc</a></p>
+            <p><a href="http://cdn.dashjs.org/latest/jsdoc/module-Settings.html#~StreamingSettings__anchor"
+                  target="_blank">setLowLatencyMinDrift() doc</a></p>
         </div>
 
         <div id="catch-up-playback-rate-help">
             <h3>Catch-up playback rate</h3>
             <p>Maximum catch-up rate, as a percentage, for low latency live streams.</p>
-            <p><a href="http://cdn.dashjs.org/latest/jsdoc/module-MediaPlayer.html#setCatchUpPlaybackRate__anchor" target="_blank">setCatchUpPlaybackRate() doc</a></p>
+            <p><a href="http://cdn.dashjs.org/latest/jsdoc/module-Settings.html#~StreamingSettings__anchor"
+                  target="_blank">setCatchUpPlaybackRate() doc</a></p>
+        </div>
+        <div id="catch-up-playback-threshold-help">
+            <h3>Live catchup latency threshold</h3>
+            <p> Use this parameter to set the maximum threshold for which live catch up is applied. For instance, if
+                this value is set to 8 seconds, then live catchup is only applied if the current live latency is equal
+                or below 8 seconds. The reason behind this parameter is to avoid an increase of the playback rate if the
+                user seeks within the DVR window.</p>
+            <p><a href="http://cdn.dashjs.org/latest/jsdoc/module-Settings.html#~StreamingSettings__anchor"
+                  target="_blank">setCatchUpPlaybackRate() doc</a></p>
         </div>
     </div>
 </div>
@@ -141,7 +161,7 @@ <h3>Catch-up playback rate</h3>
     document.addEventListener("DOMContentLoaded", function () {
         var player = init();
 
-        setInterval(function() {
+        setInterval(function () {
             var dashMetrics = player.getDashMetrics();
             var settings = player.getSettings();
 
@@ -155,6 +175,9 @@ <h3>Catch-up playback rate</h3>
 
             var currentBuffer = dashMetrics.getCurrentBufferLevel("video");
             document.getElementById("buffer-tag").innerHTML = currentBuffer + " secs";
+            
+            document.getElementById("catchup-threshold-tag").innerHTML = settings.streaming.liveCatchupLatencyThreshold + " secs";
+            
         }, 200);
     });
 </script>
diff --git a/samples/offline/app/main.js b/samples/offline/app/main.js
index ee88cdc490..37255533a3 100644
--- a/samples/offline/app/main.js
+++ b/samples/offline/app/main.js
@@ -18,7 +18,7 @@ $(document).ready(function () {
 });
 
 angular.module('DashSourcesService', ['ngResource']).factory('sources', function ($resource) { /* jshint ignore:line */
-    return $resource('app/sources.json', {}, {
+    return $resource('../dash-if-reference-player/app/sources.json', {}, {
         query: {
             method: 'GET',
             isArray: false
@@ -263,8 +263,8 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
             if ($scope.player) {
                 $scope.player.updateSettings(config);
             }
-            if ($scope.downloader) {
-                $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_DEBUG } });
+            if ($scope.offlinePlayer) {
+                $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_DEBUG } });
             }
         } else {
             // Set default initial configuration
@@ -283,7 +283,7 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
                 }
             };
             $scope.player.updateSettings(initialConfig);
-            $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_INFO } });
+            $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_INFO } });
         }
     };
     reqConfig.open('GET', 'dashjs_config.json', true);
@@ -340,7 +340,6 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
         }
     }, $scope);
 
-
     $scope.player.initialize($scope.video, null, $scope.autoPlaySelected);
 
     // Add HTML-rendered TTML subtitles except for Firefox < v49 (issue #1164)
@@ -438,16 +437,16 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
     // Download setup
     //
     ////////////////////////////////////////
-    $scope.downloader = dashjs.MediaPlayer().create(); /* jshint ignore:line */
-    $scope.downloader.initialize($scope.video, null, $scope.autoPlaySelected);
+    $scope.offlinePlayer = dashjs.MediaPlayer().create(); /* jshint ignore:line */
+    $scope.offlinePlayer.initialize($scope.video, null, $scope.autoPlaySelected);
 
     $scope.downloads = DownloadService.getDownloads();
-    DownloadService.init($scope.downloader);
+    DownloadService.init($scope.offlinePlayer);
 
-    $scope.downloader.on(dashjs.MediaPlayer.events.DOWNLOADABLE_REPRESENTATIONS_LOADED, function (e) { /* jshint ignore:line */
-        console.log(JSON.stringify(e.data));
-        $scope.downloadableRepresentations = e.data.downloadableRepresentations;
-        $scope.manifestId = e.data.id;
+    $scope.offlinePlayer.on(dashjs.MediaPlayer.events.OFFLINE_RECORD_LOADEDMETADATA, function (e) { /* jshint ignore:line */
+        console.log(JSON.stringify(e));
+        $scope.mediaInfos = e.mediaInfos;
+        $scope.manifestId = e.id;
         $scope.showRepresentationModal();
     }, $scope);
 
@@ -670,32 +669,32 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
         switch (level) {
             case 'none':
                 $scope.player.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_NONE } });
-                $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_NONE } });
+                $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_NONE } });
                 break;
 
             case 'fatal':
                 $scope.player.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_FATAL } });
-                $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_FATAL } });
+                $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_FATAL } });
                 break;
 
             case 'error':
                 $scope.player.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_ERROR } });
-                $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_ERROR } });
+                $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_ERROR } });
                 break;
 
             case 'warning':
                 $scope.player.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_WARNING } });
-                $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_WARNING } });
+                $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_WARNING } });
                 break;
 
             case 'info':
                 $scope.player.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_INFO } });
-                $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_INFO } });
+                $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_INFO } });
                 break;
 
             default:
                 $scope.player.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_DEBUG } });
-                $scope.downloader.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_DEBUG } });
+                $scope.offlinePlayer.updateSettings({ 'debug': { 'logLevel': dashjs.Debug.LOG_LEVEL_DEBUG } });
         }
     };
 
@@ -1028,7 +1027,7 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
     //
     ////////////////////////////////////////
 
-    $scope.player.on(dashjs.MediaPlayer.events.DOWNLOADING_STARTED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.OFFLINE_RECORD_STARTED, function (e) { /* jshint ignore:line */
         $scope.successMessage = e.message;
         $('.alert.alert-success').show();
         $('.alert.alert-success').fadeTo(2500, 500).slideUp(500, function () {
@@ -1036,7 +1035,7 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
         });
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.DOWNLOADING_FINISHED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.OFFLINE_RECORD_FINISHED, function (e) { /* jshint ignore:line */
         $scope.successMessage = e.message;
         $('.alert.alert-success').show();
         $('.alert.alert-success').fadeTo(2500, 500).slideUp(500, function () {
@@ -1044,7 +1043,7 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
         });
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.DOWNLOADING_STOPPED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.OFFLINE_RECORD_STOPPED, function (e) { /* jshint ignore:line */
         $scope.warningMessage = e.message;
         $('.alert.alert-warning').show();
         $('.alert.alert-warning').fadeTo(2500, 500).slideUp(500, function () {
@@ -1058,7 +1057,7 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
 
     $scope.hideRepresentationModal = function () {
         $scope.manifestId = undefined;
-        $scope.downloadableRepresentations = null;
+        $scope.mediaInfos = null;
         $('#representationModal').modal('hide');
     };
 
@@ -1092,13 +1091,26 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri
         return representations;
     };
 
+    $scope.getSelectedMediaInfos = function () {
+        let mediaInfos = [];
+        $scope.mediaInfos.forEach(mediaInfo => {
+            let selected = false;
+            mediaInfo.bitrateList = mediaInfo.bitrateList.filter(bitrate => {
+                selected = selected || bitrate.selected;
+                return bitrate.selected;
+            });
+            if (selected) {
+                mediaInfos.push(mediaInfo);
+            }
+        });
+        return mediaInfos;
+    };
+
     $scope.onStartDownload = function () {
-        let selectedRepresentation = $scope.getSelectedRepresentations();
+        let mediaInfos = $scope.getSelectedMediaInfos();
 
-        if (selectedRepresentation.video.length >= 1 ||
-            selectedRepresentation.audio.length >= 1 ||
-            selectedRepresentation.text.length >= 1) {
-            $scope.downloader.startDownload($scope.manifestId, selectedRepresentation);
+        if (mediaInfos.length) {
+            $scope.offlinePlayer.getOfflineController().startRecord($scope.manifestId, mediaInfos);
             $scope.hideRepresentationModal();
         } else {
             alert('You must select at least 1 quality !');
diff --git a/samples/offline/app/offline/directives/download.js b/samples/offline/app/offline/directives/download.js
index 7c1a48af2b..5458c3fa86 100644
--- a/samples/offline/app/offline/directives/download.js
+++ b/samples/offline/app/offline/directives/download.js
@@ -14,7 +14,7 @@ angular.module('DashPlayer').
                 scope.progressTimer = null;
                 scope.downloadProgression = DownloadService.getDownloadProgression(scope.download.id);
                 scope.isEnabled = true;
-                
+
                 scope.$watch('download.status', function (newValue) {
                     if (newValue === 'created') {
                       scope.onCreated(scope);
@@ -35,16 +35,16 @@ angular.module('DashPlayer').
                 };
 
                 scope.doStop = function () {
-                    DownloadService.doStopDownload(scope.download.id);
+                    DownloadService.doStopRecord(scope.download.id);
                 };
 
                 scope.doResume = function () {
-                    DownloadService.doResumeDownload(scope.download.id);
+                    DownloadService.doResumeRecord(scope.download.id);
                 };
 
                 scope.doDelete = function () {
                     scope.isEnabled = false;
-                    DownloadService.doDeleteDownload(scope.download.id);
+                    DownloadService.doDeleteRecord(scope.download.id);
                 };
 
                 scope.updateDownloadProgression = function () {
@@ -56,7 +56,7 @@ angular.module('DashPlayer').
 
                 scope.isDownloadEnabled = function () {
                   return scope.isEnabled;
-                };        
+                };
 
                 scope.canPlay = function () {
                     return scope.download.status === 'stopped' ||
diff --git a/samples/offline/app/offline/services/downloadService.js b/samples/offline/app/offline/services/downloadService.js
index 4db5d96e22..bcf4ac2138 100644
--- a/samples/offline/app/offline/services/downloadService.js
+++ b/samples/offline/app/offline/services/downloadService.js
@@ -5,45 +5,46 @@ angular.module('DashPlayer').
 service('DownloadService', function () {
 
     player = undefined;
-    var downloads = [];
+    let offlineController = undefined;
+    let records = [];
 
-    this.getDownload = function (id) {
-        let element = downloads.find((download) => {
-            return download.id === id;
+    this.getRecord = function (id) {
+        let element = records.find((record) => {
+            return record.id === id;
         });
 
         return element;
     };
 
     this.getDownloads = function () {
-        return downloads;
+        return records;
     };
 
     this.init = function (playerInstance) {
         player = playerInstance;
+        offlineController = player.getOfflineController();
 
-        player.on(dashjs.MediaPlayer.events.DOWNLOADING_STARTED, (e) => {
-            let download = this.getDownload(e.id);
-            if (download) {
-                download.status = 'started';
+        player.on(dashjs.MediaPlayer.events.OFFLINE_RECORD_STARTED, (e) => {
+            let record = this.getRecord(e.id);
+            if (record) {
+                record.status = 'started';
             }
         }, this);
 
-        player.on(dashjs.MediaPlayer.events.DOWNLOADING_FINISHED, (e) => {
-            let download = this.getDownload(e.id);
-            if (download) {
-                download.status = 'finished';
+        player.on(dashjs.MediaPlayer.events.OFFLINE_RECORD_FINISHED, (e) => {
+            let record = this.getRecord(e.id);
+            if (record) {
+                record.status = 'finished';
             }
         }, this);
 
-        player.on(dashjs.MediaPlayer.events.DOWNLOADING_STOPPED, (e) => {
-            let download = this.getDownload(e.id);
-            if (download) {
-                download.status = 'stopped';
+        player.on(dashjs.MediaPlayer.events.OFFLINE_RECORD_STOPPED, (e) => {
+            let record = this.getRecord(e.id);
+            if (record) {
+                record.status = 'stopped';
             }
         }, this);
 
-
         player.on(dashjs.MediaPlayer.events.ERROR, function (e) { /* jshint ignore:line */
             switch (e.error.code) {
                 // offline errors
@@ -68,50 +69,48 @@ service('DownloadService', function () {
             }
         }, this);
 
-        player.loadDownloadsFromStorage().then(() => {
-            this.getAllDownloads();
+        offlineController.loadRecordsFromStorage().then(() => {
+            this.getAllRecords();
         });
     };
 
-    this.getAllDownloads = function () {
-        downloads.splice(0, downloads.length);
-        player.getAllDownloads().forEach(element => {
-            downloads.push(element);
+    this.getAllRecords = function () {
+        records.splice(0, records.length);
+        offlineController.getAllRecords().forEach(element => {
+            records.push(element);
         });
     };
 
     this.doDownload = function (url) {
-        player.createDownload(url).then((id) => {
+        offlineController.createRecord(url).then((id) => {
             id = id;
-            // new download has been created, let's refresh download list
-            this.getAllDownloads();
-            // init download
-            player.initDownload(id);
+            // new record has been created, let's refresh record list
+            this.getAllRecords();
         });
     };
 
-    this.doDeleteDownload = function (id) {
-        player.deleteDownload(id).then(() => {
-            this.getAllDownloads();
+    this.doDeleteRecord = function (id) {
+        offlineController.deleteRecord(id).then(() => {
+            this.getAllRecords();
         });
     };
 
-    this.doStopDownload = function (id) {
-        player.stopDownload(id);
+    this.doStopRecord = function (id) {
+        offlineController.stopRecord(id);
     };
 
-    this.doResumeDownload = function (id) {
-        player.resumeDownload(id);
+    this.doResumeRecord = function (id) {
+        offlineController.resumeRecord(id);
     };
 
     this.getDownloadProgression = function (id) {
-        return player.getDownloadProgression(id);
+        return offlineController.getRecordProgression(id);
     };
 
     this.onError = function (error) {
-        let download = this.getDownload(error.data.id);
-        if (download) {
-            download.status = `error - ${error.message}`;
+        let record = this.getRecord(error.data.id);
+        if (record) {
+            record.status = `error - ${error.message}`;
         }
     };
 
diff --git a/samples/offline/app/sources.json b/samples/offline/app/sources.json
deleted file mode 100644
index c24e836d85..0000000000
--- a/samples/offline/app/sources.json
+++ /dev/null
@@ -1,945 +0,0 @@
-{
-  "items": [
-    {
-      "name": "VOD (Static MPD)",
-      "submenu": [
-        {
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-events.mpd",
-          "name": "SegmentTemplate/Number, live profile",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        },
-        {
-          "url": "https://dash.akamaized.net/dash264/TestCases/1a/sony/SNE_DASH_SD_CASE1A_REVISED.mpd",
-          "name": "SegmentBase, ondemand profile"
-        },
-        {
-          "url": "http://demo.unified-streaming.com/video/ateam/ateam.ism/ateam.mpd",
-          "name": "SegmentTimeline/Time"
-        },
-        {
-          "url": "https://dash.akamaized.net/dash264/TestCases/5a/1/manifest.mpd",
-          "name": "Multiperiod"
-        },
-        {
-          "url": "https://dash.akamaized.net/envivio/EnvivioDash3/manifest.mpd",
-          "name": "SegmentTemplate, live profile - Envivio"
-        },
-        {
-          "url": "https://dash.akamaized.net/akamai/test/caption_test/ElephantsDream/elephants_dream_480p_heaac5_1.mpd",
-          "name": "External VTT subtitle file"
-        },
-        {
-          "url": "https://dash.akamaized.net/akamai/bbb_30fps/bbb_30fps.mpd",
-          "name": "SegmentTemplate/Number, live profile, 250kbps up to 15Mbps@4K."
-        }
-      ]
-    },
-    {
-      "name": "LIVE (Dynamic MPD)",
-      "submenu": [
-        {
-          "url": "https://vm2.dashif.org/livesim/testpic_2s/Manifest.mpd",
-          "name": "SegmentTemplate without manifest updates (livesim)"
-        },
-        {
-          "url": "https://vm2.dashif.org/livesim/mup_30/testpic_2s/Manifest.mpd",
-          "name": "SegmentTemplate with manifest updates every 30s (livesim)"
-        },
-        {
-          "url": "https://vm2.dashif.org/livesim-dev/segtimeline_1/testpic_2s/Manifest.mpd",
-          "name": "SegmentTimeline (livesim-dev)"
-        },
-        {
-          "url": "https://vm2.dashif.org/livesim-dev/periods_60/continuous_1/testpic_2s/Manifest.mpd",
-          "name": "Multiperiod SegmentTemplate. New period every minute (livesim)"
-        },
-        {
-            "url": "http://irtdashreference-i.akamaihd.net/dash/live/901161/bfs/manifestARD.mpd",
-            "name": "IRT reference with EBU-TT-D subtitles"
-        },
-        {
-            "url": "http://irtdashreference-i.akamaihd.net/dash/live/901161/keepixo1/manifestBR2.mpd",
-            "name": "IRT CMAF reference with subtitles"
-        },
-        {
-          "url": " https://vm2.dashif.org/livesim-dev/ato_10/testpic_2s/Manifest.mpd",
-          "name": "10 seconds availabilityTimeOffset (livesim)"
-        },
-        {
-          "url": "https://vm2.dashif.org/livesim-dev/ato_inf/testpic_2s/Manifest.mpd",
-          "name": "Infinite offset - all segments available at availability start (livesim)"
-        },
-        {
-          "url": "https://vm2.dashif.org/livesim-chunked/chunkdur_1/ato_7/testpic4_8s/Manifest300.mpd",
-          "name": "Low Latency (Single-Rate)",
-          "bufferConfig" : {
-            "lowLatencyMode": true,
-            "liveDelay": 2.8
-          }
-        },
-        {
-          "url": "https://vm2.dashif.org/livesim-chunked/chunkdur_1/ato_7/testpic4_8s/Manifest.mpd",
-          "name": "Low Latency (Multi-Rate)",
-          "bufferConfig" : {
-            "lowLatencyMode": true,
-            "liveDelay": 2.8
-          }
-        },
-        {
-          "url": "http://24x7dash-i.akamaihd.net/dash/live/900080/dash-demo/dash.mpd",
-          "name": "Akamai 24x7 reference stream - segmentTemplate"
-        },
-        {
-          "url": "https://akamai-axtest.akamaized.net/routes/lapd-v1-acceptance/www_c4/Manifest.mpd",
-          "name": "Axinom reference stream (Live-Clear)",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors#live-clear"
-        },
-        {
-           "url": "https://live.unified-streaming.com/scte35/scte35.isml/.mpd",
-           "name": "Unified Streaming reference stream with scte35 markers",
-           "moreInfo": "http://demo.unified-streaming.com/features.html"
-        }
-      ]
-    },
-    {
-      "name": "Subtitles and Captions",
-      "submenu": [
-        {
-          "name": "TTML Segmented Subtitles VoD",
-          "url": "https://vm2.dashif.org/dash/vod/testpic_2s/multi_subs.mpd"
-        },
-        {
-          "name": "TTML Segmented Subtitles Live (livesim)",
-          "url": "https://vm2.dashif.org/livesim/testpic_2s/multi_subs.mpd"
-        },
-        {
-          "name": "TTML Sideloaded XML Subtitles",
-          "url": "https://vm2.dashif.org/dash/vod/testpic_2s/xml_subs.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions",
-          "url": "https://vm2.dashif.org/dash/vod/testpic_2s/cea608.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions (livesim)",
-          "url": "https://vm2.dashif.org/livesim/testpic_2s/cea608.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions and TTML segments VoD",
-          "url": "https://vm2.dashif.org/dash/vod/testpic_2s/cea608_and_segs.mpd"
-        },
-        {
-          "name": "Embedded CEA-608 Closed Captions and TTML segments Live (livesim)",
-          "url": "https://vm2.dashif.org/livesim/testpic_2s/cea608_and_segs.mpd"
-        },
-        {
-          "name": "TTML Segmented 'snaking' subtitles (with random text) (Ondemand)",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/1/client_manifest-snake.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/"
-        },
-        {
-            "url": "https://dash.akamaized.net/dash264/CTA/imsc1/IT1-20171027_dash.mpd",
-            "name": "IMSC1 Text Subtitles via sidecar file"
-        },
-        {
-          "url": "https://vm2.dashif.org/dash/vod/testpic_2s/imsc1_img.mpd",
-          "name": "IMSC1 (CMAF) Image Subtitles",
-          "moreInfo": "https://vm2.dashif.org/dash/vod/testpic_2s/imsc1_img_subs_info.html"
-        },
-        {
-          "name": "TTML Image Subtitles embedded (VoD)",
-          "url": "https://vm2.dashif.org/dash/vod/testpic_2s/img_subs.mpd",
-          "moreInfo": "https://vm2.dashif.org/dash/vod/testpic_2s/img_subs_info.html"
-        }
-      ]
-    },
-    {
-      "name": "Thumbnails",
-      "submenu": [
-        {
-          "name": "Single adaption set, 7 tiles at 10x1, each thumb 320x180",
-          "url": "http://dash.edgesuite.net/akamai/bbb_30fps/bbb_with_tiled_thumbnails.mpd"
-        },
-        {
-          "name": "Single adaption set, 4 tiles at 10x1, each thumb 205x115",
-          "url": "http://dash.edgesuite.net/akamai/bbb_30fps/bbb_with_4_tiles_thumbnails.mpd"
-        },
-        {
-          "name": "Single adaption set, 1 tile at 10x20, each thumb 102x58",
-          "url": "http://dash.edgesuite.net/akamai/bbb_30fps/bbb_with_tiled_thumbnails_2.mpd"
-        },
-        {
-          "name": "Two adaption sets with different thumb resolutions",
-          "url": "http://dash.edgesuite.net/akamai/bbb_30fps/bbb_with_multiple_tiled_thumbnails.mpd"
-        },
-        {
-          "name": "Live stream, Single adaptation set, 1x1 tiles",
-          "url": "http://vm2.dashif.org/livesim-dev/testpic_2s/Manifest_thumbs.mpd"
-        }
-      ]
-    },
-    {
-      "name": "Audio-only",
-      "submenu": [
-        {
-          "name": "48k AAC-LC Stereo Beeps (Live)",
-          "url": "https://vm2.dashif.org/livesim/testpic_2s/audio.mpd"
-        },
-        {
-          "name": "48k AAC-LC Stereo Beeps (Ondemand)",
-          "url": "https://vm2.dashif.org/dash/vod/testpic_2s/audio.mpd"
-        },
-        {
-          "name": "128k AAC-LC Stereo 1kHz Tone (Ondemand)",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-audio-1kHz.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        },
-        {
-          "name": "128k/320k AAC-LC Stereo/5.1 'Testcard' (Ondemand)",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-audio.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        }
-      ]
-    },
-    {
-      "name": "Axinom Test Content (modern)",
-      "submenu": [
-        {
-          "name": "1080p with Widevine DRM, license expired after 60s",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImZpcnN0X3BsYXlfZXhwaXJhdGlvbiI6NjAsInBsYXlyZWFkeSI6eyJyZWFsX3RpbWVfZXhwaXJhdGlvbiI6dHJ1ZX0sImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.FAbIiPxX8BHi9RwfzD7Yn-wugU19ghrkBFKsaCPrZmU"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with W3C Clear Key, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_1080p_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-           "name": "2160p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-           "name": "2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-           "name": "2160p with W3C Clear Key, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-           "name": "2160p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_AudioOnly.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.4lWwW46k-oWcah8oN18LPj5OLS5ZU-_AQv7fe0JhNjA"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_AudioOnly.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiODAzOTliZjUtOGEyMS00MDE0LTgwNTMtZTI3ZTc0OGU5OGMwIiwiZW5jcnlwdGVkX2tleSI6ImxpTkpxVmFZa05oK01LY3hKRms3SWc9PSJ9LHsiaWQiOiI5MDk1M2UwOS02Y2IyLTQ5YTMtYTI2MC03YTVmZWZlYWQ0OTkiLCJlbmNyeXB0ZWRfa2V5Ijoia1l0SEh2cnJmQ01lVmRKNkxrYmtuZz09In0seyJpZCI6IjBlNGRhOTJiLWQwZTgtNGE2Ni04YzNmLWMyNWE5N2ViNjUzMiIsImVuY3J5cHRlZF9rZXkiOiI3dzdOWkhITE1nSjRtUUtFSzVMVE1RPT0ifSx7ImlkIjoiNTg1ZjIzM2YtMzA3Mi00NmYxLTlmYTQtNmRjMjJjNjZhMDE0IiwiZW5jcnlwdGVkX2tleSI6IkFjNFVVbVl0Qko1blBROU4xNXJjM2c9PSJ9LHsiaWQiOiI0MjIyYmQ3OC1iYzQ1LTQxYmYtYjYzZS02ZjgxNGRjMzkxZGYiLCJlbmNyeXB0ZWRfa2V5IjoiTzZGTzBmcVNXb3BwN2JqYy9ENGxNQT09In1dfX0.uF6YlKAREOmbniAeYiH070HSJhV0YS7zSKjlCtiDR5Y"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with W3C Clear Key, single key",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_AudioOnly_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "nrQFDeRLSAKTLifXUIPiZg": "FmY0xnWCPCNaSpRG-tUuTQ"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey/Manifest_AudioOnly_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Audio without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_AudioOnly.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 1080p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 2160p with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_ClearKey.mpd",
-          "protData": {
-            "org.w3.clearkey": {
-              "clearkeys": {
-                "gDmb9YohQBSAU-J-dI6YwA": "3aHppzZ2g3Y3wK1uNnUXmg",
-                "kJU-CWyySaOiYHpf7-rUmQ": "zsmKW7Mq9Unz5R7oUGeF8w",
-                "Dk2pK9DoSmaMP8Jal-tlMg": "UmYYfGb7znuoFAQM79ayHw",
-                "WF8jPzByRvGfpG3CLGagFA": "jayKpC3tmPq4YKXkapa8FA",
-                "QiK9eLxFQb-2Pm-BTcOR3w": "GAMi9v92b9ca5yBwaptN-Q"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period 2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period audio with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_AudioOnly.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1IiwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJlbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnlwdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0ZWRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tleSI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5IjoiL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6dTZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period audio with W3C Clear Key, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v7-MultiDRM-MultiKey-MultiPeriod/Manifest_AudioOnly_ClearKey.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Multi-period audio without encryption",
-          "url": "https://media.axprod.net/TestVectors/v7-Clear/Manifest_MultiPeriod_AudioOnly.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        },
-        {
-          "name": "Complex multi-period with different content, encrypted",
-          "url": "https://media.axprod.net/TestVectors/v8-MultiContent/Encrypted/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXNzYWdlIjp7InBsYXlyZWFkeSI6eyJtaW5fYXBwX3NlY3VyaXR5X2xldmVsIjoxNTAsInBsYXlfZW5hYmxlcnMiOlsiNzg2NjI3RDgtQzJBNi00NEJFLThGODgtMDhBRTI1NUIwMUE3Il19LCJrZXlzIjpbeyJlbmNyeXB0ZWRfa2V5IjoiN1hIS21uL3NmdnVQTFd0UHRHVFpEUT09IiwiaWQiOiIxZWIzMzJiMi03NDM3LTQ5YWUtYmYzOS1lNzAwMTBjYjYyMGIifSx7ImVuY3J5cHRlZF9rZXkiOiJzUXRGWDh6Y2o5bEVyZ282RDdjNGh3PT0iLCJpZCI6IjlhYTYwZTNhLTljOTEtNDc0ZC04OTM3LTdkOGIzMjU5Y2NjZCJ9LHsiZW5jcnlwdGVkX2tleSI6Im8wUlY0a2tuVE1KTFFkeVh1a1VlT2c9PSIsImlkIjoiNTk0Nzk3YTctNmIwMC00NjczLWIyZTEtYWVmYzU1MmIxYmJjIn0seyJlbmNyeXB0ZWRfa2V5IjoiZVl1dlIvS1BhWCtXWG43Rkw5WkNxQT09IiwiaWQiOiJhYWUyNTc1OC1lNDgxLTQ4OTUtODEzMy1iODA5NDgzMzkzZDAifSx7ImVuY3J5cHRlZF9rZXkiOiIwQ1BUWVpMWmk1SmhZZ0NiZThKTnhRPT0iLCJpZCI6IjkzMTEzZDVlLTJlYzgtNDNjMS05MDgzLTEwZjNkZTIwM2EyOSJ9LHsiZW5jcnlwdGVkX2tleSI6IlFQUlBrQ09tenNORkl1cCszSFp3WWc9PSIsImlkIjoiZTQ4NzcwMzctNDM3Ni00ZWRkLTg1ODYtMTQ1MTk0MzU4ODAzIn0seyJlbmNyeXB0ZWRfa2V5IjoiVWtrWUZ0TXJGMnlET0hvYWxKRmZSZz09IiwiaWQiOiJlOGFkNTk3Mi04ODE5LTQzMjYtYWQ2YS1mOWExNTE2OGJjYTcifSx7ImVuY3J5cHRlZF9rZXkiOiJkdWhnRVJSRkRiZlFEcnlwUWRCUUVRPT0iLCJpZCI6IjI2YTA5MzlmLTNhMGMtNDI4OS1hZDZiLWJiNWNlYzE3ZmY0MCJ9LHsiZW5jcnlwdGVkX2tleSI6IjFOUHp1Q1JLM3p4bWpYK3FZZnU1bXc9PSIsImlkIjoiYTVlZDcxNzMtMzc4MS00Yzc0LTkwYWMtZjA4MzRlZjFhMWM4In0seyJlbmNyeXB0ZWRfa2V5IjoiYXVQTEJjd2NmTnFSRTV1WFdUZ1NLUT09IiwiaWQiOiIzMjlmNTMzZS1mYTc3LTQwNzAtYjY1Yi0zOTI5ODBiYWRhMGQifSx7ImVuY3J5cHRlZF9rZXkiOiI2NkE1MnFiZEcyQlg3SUhTaml6WUpRPT0iLCJpZCI6IjE5N2Y4Yjg0LTNiZjItNDg2MC1iMjNhLTVjNTQ2MjhhZDBiMSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhIUUE3WWlEZGZwTE05QWxwcklDK2c9PSIsImlkIjoiNGVjZGQ0YzctNGQyOS00M2ZmLWJkYWYtMDJiNzY5MDBmMTIzIn0seyJlbmNyeXB0ZWRfa2V5IjoiblBqNWl3N1IvZDR0WmdKZktoRFhYZz09IiwiaWQiOiJlZTc0NmQxMi1hNDg4LTQ5NzctYjFjYS03N2ExMDFiYjQ4M2MifSx7ImVuY3J5cHRlZF9rZXkiOiJ5U1Vma0Q5ZEliK0ExNmoydHNzNDV3PT0iLCJpZCI6IjQ5NGY5NmUxLTM1MzUtNGE4NC05MWMxLWZhYTI4M2IwNmE1NCJ9LHsiZW5jcnlwdGVkX2tleSI6InJlUHVsaXg0eFZNZHlsUnVpcG5FK0E9PSIsImlkIjoiNWMwN2JmZjQtYzcwYi00ZDAyLWEzNzgtMzgzMjZmOTEwMDBjIn0seyJlbmNyeXB0ZWRfa2V5Ijoialc3Z2E0aytMcDdxWTd4Zmo5dHB5Zz09IiwiaWQiOiIzMjgzYzM1ZS1hZTJjLTRmOGMtOGE0OS00YTc1MGFlZGYxNDIifSx7ImVuY3J5cHRlZF9rZXkiOiJLdHNNYlZRM0JXL1dwQlIwSlQwa2R3PT0iLCJpZCI6IjhkNzdiOWM0LTdmNmQtNDdmOS04NTYyLWE1ZTVlNGMzNTFjZSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhRTGZKQUpmSjFyelFMZGNFRWM5L2c9PSIsImlkIjoiODIzMTcxZDctZGZjMS00ZDBlLTgwM2YtNDBhMWY1ZTQzODY4In0seyJlbmNyeXB0ZWRfa2V5IjoiR0hQSVNYTXZKWEJ6WktGQm1ZMXFCZz09IiwiaWQiOiJjMTYyYWM3ZC00MGQ3LTQ2YzAtYjJjZC1lOTQyN2Q0MzljMzIifSx7ImVuY3J5cHRlZF9rZXkiOiJ2bzJhamlLaWV6Yk9xY2tyNTN0U3B3PT0iLCJpZCI6ImZhYTZkNmY1LTM1MDEtNDg1MS05MmViLWM3ZGE0NDRlY2FhYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ijg2QkEwUHYwYXk4UmV5Wk4zeElYa2c9PSIsImlkIjoiZmM0OWI3MTEtMWNiNi00MGE3LTk4NDAtODNjNDFiNTViOTliIn0seyJlbmNyeXB0ZWRfa2V5IjoibUhBbERaa0NYQWpCR1pLR2h0Y3Zpdz09IiwiaWQiOiI0M2QwMjIwNC04NjA5LTRkNDYtOTlhYy00MjVhNWI0ODAwOTgifSx7ImVuY3J5cHRlZF9rZXkiOiJ3bWhjREdZcG84YlZBSit0OGF4SUZnPT0iLCJpZCI6IjRkNmU0OTZhLTFmOTgtNGVlOC04Zjg3LTRiMTAzYmQzOGQwZiJ9LHsiZW5jcnlwdGVkX2tleSI6Ik92cWF3Y0JVQVE3cHM2T0xhSnZPRmc9PSIsImlkIjoiYzRlMGQ5ZjctZDQ4Mi00MWMzLThjYmItOTdiMTEyZDcyZTY2In0seyJlbmNyeXB0ZWRfa2V5IjoiM3dTMkdpemxWcGtuNDlRRExxcFBhZz09IiwiaWQiOiIxYzJkZTFlNC1lZDMwLTQ0NTItYTExNS0wOTIzYjk0MGM0ZWQifSx7ImVuY3J5cHRlZF9rZXkiOiJTNWRGQ25yRUNjREswOEVreHllY3lRPT0iLCJpZCI6ImRjZjQzODVmLTM1MDUtNGZmNS1iMDU1LTQ2MWQ1YTA3ZjBmNSJ9LHsiZW5jcnlwdGVkX2tleSI6IlBnRUhyK0Nrd3JYTStlSWFnUnl4b3c9PSIsImlkIjoiZjMyNGYwNGUtN2M3My00ZjM3LTgxMzUtYzg5ZjhjNGU2Y2Y0In0seyJlbmNyeXB0ZWRfa2V5IjoiSkx6UUZGMXp4MFpZMzZYSTdaR0VaUT09IiwiaWQiOiI1Y2I1M2RkOC0xMjk0LTRjOGUtOTY0ZS0yNTg2OWQ1M2EyNGEifSx7ImVuY3J5cHRlZF9rZXkiOiJVOHBRdW1HUmtrTGppSEg1cjlqWGhnPT0iLCJpZCI6IjA1NjgyYTI2LTg4NzctNDZkMy05NDY1LTEwNGEzYTQwMDEwYSJ9LHsiZW5jcnlwdGVkX2tleSI6IlVJTDZKNGRzZEpGNi9tQTM1dHIvVFE9PSIsImlkIjoiYmNlNTM0MTAtM2IwYy00OTE0LTg3YTMtNzIzNjNjYTE3NTMxIn0seyJlbmNyeXB0ZWRfa2V5IjoiM3pCaW1Dc2NlMTV2YkV0Mm8zNEhhUT09IiwiaWQiOiI0ZjRmOGExYy0zMjAyLTQ2YWUtODA5ZS00ZmNmOTMzZWU2NTQifSx7ImVuY3J5cHRlZF9rZXkiOiJDVHdTU3RQMnV1QjVZdStNUGpZY29RPT0iLCJpZCI6Ijg1MmNkN2Y3LTQwZTktNDgyZC04MjI1LWRjYmM4ZTA4ZGI4YiJ9LHsiZW5jcnlwdGVkX2tleSI6Im1ubXRuUWVHYm0rZUEzN2t6dFovRVE9PSIsImlkIjoiZWZkZGI4ZWUtODI3OC00NDM2LWE2OTgtNzJiODAzZDA1MGRiIn0seyJlbmNyeXB0ZWRfa2V5Ijoib3BicXltZVRiT3VWalJnYjJHMHpVdz09IiwiaWQiOiJkNWJkYmE1My02MDZmLTRkNDYtODg4ZC1hMWViNDRjZDVmNDEifSx7ImVuY3J5cHRlZF9rZXkiOiJiSWRsOFhoVmdobmc4Tis4cUZVbFRnPT0iLCJpZCI6ImFlZDQ5NjA5LTUwOTktNDExOC05YjA4LWI5NTM4ZGIwMGMwYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ikp1SS9UMSt5cUtzUU95MjZEbzRuZmc9PSIsImlkIjoiN2I1YzFlOWYtZjhiOC00OTkyLWFhM2UtYTA4NWZjMzY3MzExIn0seyJlbmNyeXB0ZWRfa2V5IjoiM2ladUZxalh3bzhiN1lkamxKZUVPUT09IiwiaWQiOiI1YmU0MGViZi0yZWE0LTQ5ZmItYjZlYy1iMDlkZTVhYjYxN2YifSx7ImVuY3J5cHRlZF9rZXkiOiJoQ3gybzJxQlJKL2hiZVNqKzY5dHF3PT0iLCJpZCI6ImU1MzBkZjFiLWZmN2UtNDJhNC1iNTNhLThkNmRlNjhmMDAxMCJ9LHsiZW5jcnlwdGVkX2tleSI6IjhveWlGM0pQTmdzd0tPajVrWjVIT0E9PSIsImlkIjoiYjk0OTg3NDUtODJlYS00ZmZhLWFiMmItZDczN2VmNTRmODYzIn0seyJlbmNyeXB0ZWRfa2V5IjoiTEs4TENTY28zQmZYZXhLMlh0WUZSQT09IiwiaWQiOiI0ZjUyOTc1Yi1lOWYzLTRmZDctYmI4OS00MDNiMjgwMGU4Y2YifV0sInR5cGUiOiJlbnRpdGxlbWVudF9tZXNzYWdlIn0sImNvbV9rZXlfaWQiOiJiMzM2NGViNS01MWY2LTRhZTMtOGM5OC0zM2NlZDVlMzFjNzgiLCJ2ZXJzaW9uIjoxfQ.kuZip7wOBZ6-FjAO_VcBq0r816426dFK4fTdfm99NqE"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXNzYWdlIjp7InBsYXlyZWFkeSI6eyJtaW5fYXBwX3NlY3VyaXR5X2xldmVsIjoxNTAsInBsYXlfZW5hYmxlcnMiOlsiNzg2NjI3RDgtQzJBNi00NEJFLThGODgtMDhBRTI1NUIwMUE3Il19LCJrZXlzIjpbeyJlbmNyeXB0ZWRfa2V5IjoiN1hIS21uL3NmdnVQTFd0UHRHVFpEUT09IiwiaWQiOiIxZWIzMzJiMi03NDM3LTQ5YWUtYmYzOS1lNzAwMTBjYjYyMGIifSx7ImVuY3J5cHRlZF9rZXkiOiJzUXRGWDh6Y2o5bEVyZ282RDdjNGh3PT0iLCJpZCI6IjlhYTYwZTNhLTljOTEtNDc0ZC04OTM3LTdkOGIzMjU5Y2NjZCJ9LHsiZW5jcnlwdGVkX2tleSI6Im8wUlY0a2tuVE1KTFFkeVh1a1VlT2c9PSIsImlkIjoiNTk0Nzk3YTctNmIwMC00NjczLWIyZTEtYWVmYzU1MmIxYmJjIn0seyJlbmNyeXB0ZWRfa2V5IjoiZVl1dlIvS1BhWCtXWG43Rkw5WkNxQT09IiwiaWQiOiJhYWUyNTc1OC1lNDgxLTQ4OTUtODEzMy1iODA5NDgzMzkzZDAifSx7ImVuY3J5cHRlZF9rZXkiOiIwQ1BUWVpMWmk1SmhZZ0NiZThKTnhRPT0iLCJpZCI6IjkzMTEzZDVlLTJlYzgtNDNjMS05MDgzLTEwZjNkZTIwM2EyOSJ9LHsiZW5jcnlwdGVkX2tleSI6IlFQUlBrQ09tenNORkl1cCszSFp3WWc9PSIsImlkIjoiZTQ4NzcwMzctNDM3Ni00ZWRkLTg1ODYtMTQ1MTk0MzU4ODAzIn0seyJlbmNyeXB0ZWRfa2V5IjoiVWtrWUZ0TXJGMnlET0hvYWxKRmZSZz09IiwiaWQiOiJlOGFkNTk3Mi04ODE5LTQzMjYtYWQ2YS1mOWExNTE2OGJjYTcifSx7ImVuY3J5cHRlZF9rZXkiOiJkdWhnRVJSRkRiZlFEcnlwUWRCUUVRPT0iLCJpZCI6IjI2YTA5MzlmLTNhMGMtNDI4OS1hZDZiLWJiNWNlYzE3ZmY0MCJ9LHsiZW5jcnlwdGVkX2tleSI6IjFOUHp1Q1JLM3p4bWpYK3FZZnU1bXc9PSIsImlkIjoiYTVlZDcxNzMtMzc4MS00Yzc0LTkwYWMtZjA4MzRlZjFhMWM4In0seyJlbmNyeXB0ZWRfa2V5IjoiYXVQTEJjd2NmTnFSRTV1WFdUZ1NLUT09IiwiaWQiOiIzMjlmNTMzZS1mYTc3LTQwNzAtYjY1Yi0zOTI5ODBiYWRhMGQifSx7ImVuY3J5cHRlZF9rZXkiOiI2NkE1MnFiZEcyQlg3SUhTaml6WUpRPT0iLCJpZCI6IjE5N2Y4Yjg0LTNiZjItNDg2MC1iMjNhLTVjNTQ2MjhhZDBiMSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhIUUE3WWlEZGZwTE05QWxwcklDK2c9PSIsImlkIjoiNGVjZGQ0YzctNGQyOS00M2ZmLWJkYWYtMDJiNzY5MDBmMTIzIn0seyJlbmNyeXB0ZWRfa2V5IjoiblBqNWl3N1IvZDR0WmdKZktoRFhYZz09IiwiaWQiOiJlZTc0NmQxMi1hNDg4LTQ5NzctYjFjYS03N2ExMDFiYjQ4M2MifSx7ImVuY3J5cHRlZF9rZXkiOiJ5U1Vma0Q5ZEliK0ExNmoydHNzNDV3PT0iLCJpZCI6IjQ5NGY5NmUxLTM1MzUtNGE4NC05MWMxLWZhYTI4M2IwNmE1NCJ9LHsiZW5jcnlwdGVkX2tleSI6InJlUHVsaXg0eFZNZHlsUnVpcG5FK0E9PSIsImlkIjoiNWMwN2JmZjQtYzcwYi00ZDAyLWEzNzgtMzgzMjZmOTEwMDBjIn0seyJlbmNyeXB0ZWRfa2V5Ijoialc3Z2E0aytMcDdxWTd4Zmo5dHB5Zz09IiwiaWQiOiIzMjgzYzM1ZS1hZTJjLTRmOGMtOGE0OS00YTc1MGFlZGYxNDIifSx7ImVuY3J5cHRlZF9rZXkiOiJLdHNNYlZRM0JXL1dwQlIwSlQwa2R3PT0iLCJpZCI6IjhkNzdiOWM0LTdmNmQtNDdmOS04NTYyLWE1ZTVlNGMzNTFjZSJ9LHsiZW5jcnlwdGVkX2tleSI6IlhRTGZKQUpmSjFyelFMZGNFRWM5L2c9PSIsImlkIjoiODIzMTcxZDctZGZjMS00ZDBlLTgwM2YtNDBhMWY1ZTQzODY4In0seyJlbmNyeXB0ZWRfa2V5IjoiR0hQSVNYTXZKWEJ6WktGQm1ZMXFCZz09IiwiaWQiOiJjMTYyYWM3ZC00MGQ3LTQ2YzAtYjJjZC1lOTQyN2Q0MzljMzIifSx7ImVuY3J5cHRlZF9rZXkiOiJ2bzJhamlLaWV6Yk9xY2tyNTN0U3B3PT0iLCJpZCI6ImZhYTZkNmY1LTM1MDEtNDg1MS05MmViLWM3ZGE0NDRlY2FhYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ijg2QkEwUHYwYXk4UmV5Wk4zeElYa2c9PSIsImlkIjoiZmM0OWI3MTEtMWNiNi00MGE3LTk4NDAtODNjNDFiNTViOTliIn0seyJlbmNyeXB0ZWRfa2V5IjoibUhBbERaa0NYQWpCR1pLR2h0Y3Zpdz09IiwiaWQiOiI0M2QwMjIwNC04NjA5LTRkNDYtOTlhYy00MjVhNWI0ODAwOTgifSx7ImVuY3J5cHRlZF9rZXkiOiJ3bWhjREdZcG84YlZBSit0OGF4SUZnPT0iLCJpZCI6IjRkNmU0OTZhLTFmOTgtNGVlOC04Zjg3LTRiMTAzYmQzOGQwZiJ9LHsiZW5jcnlwdGVkX2tleSI6Ik92cWF3Y0JVQVE3cHM2T0xhSnZPRmc9PSIsImlkIjoiYzRlMGQ5ZjctZDQ4Mi00MWMzLThjYmItOTdiMTEyZDcyZTY2In0seyJlbmNyeXB0ZWRfa2V5IjoiM3dTMkdpemxWcGtuNDlRRExxcFBhZz09IiwiaWQiOiIxYzJkZTFlNC1lZDMwLTQ0NTItYTExNS0wOTIzYjk0MGM0ZWQifSx7ImVuY3J5cHRlZF9rZXkiOiJTNWRGQ25yRUNjREswOEVreHllY3lRPT0iLCJpZCI6ImRjZjQzODVmLTM1MDUtNGZmNS1iMDU1LTQ2MWQ1YTA3ZjBmNSJ9LHsiZW5jcnlwdGVkX2tleSI6IlBnRUhyK0Nrd3JYTStlSWFnUnl4b3c9PSIsImlkIjoiZjMyNGYwNGUtN2M3My00ZjM3LTgxMzUtYzg5ZjhjNGU2Y2Y0In0seyJlbmNyeXB0ZWRfa2V5IjoiSkx6UUZGMXp4MFpZMzZYSTdaR0VaUT09IiwiaWQiOiI1Y2I1M2RkOC0xMjk0LTRjOGUtOTY0ZS0yNTg2OWQ1M2EyNGEifSx7ImVuY3J5cHRlZF9rZXkiOiJVOHBRdW1HUmtrTGppSEg1cjlqWGhnPT0iLCJpZCI6IjA1NjgyYTI2LTg4NzctNDZkMy05NDY1LTEwNGEzYTQwMDEwYSJ9LHsiZW5jcnlwdGVkX2tleSI6IlVJTDZKNGRzZEpGNi9tQTM1dHIvVFE9PSIsImlkIjoiYmNlNTM0MTAtM2IwYy00OTE0LTg3YTMtNzIzNjNjYTE3NTMxIn0seyJlbmNyeXB0ZWRfa2V5IjoiM3pCaW1Dc2NlMTV2YkV0Mm8zNEhhUT09IiwiaWQiOiI0ZjRmOGExYy0zMjAyLTQ2YWUtODA5ZS00ZmNmOTMzZWU2NTQifSx7ImVuY3J5cHRlZF9rZXkiOiJDVHdTU3RQMnV1QjVZdStNUGpZY29RPT0iLCJpZCI6Ijg1MmNkN2Y3LTQwZTktNDgyZC04MjI1LWRjYmM4ZTA4ZGI4YiJ9LHsiZW5jcnlwdGVkX2tleSI6Im1ubXRuUWVHYm0rZUEzN2t6dFovRVE9PSIsImlkIjoiZWZkZGI4ZWUtODI3OC00NDM2LWE2OTgtNzJiODAzZDA1MGRiIn0seyJlbmNyeXB0ZWRfa2V5Ijoib3BicXltZVRiT3VWalJnYjJHMHpVdz09IiwiaWQiOiJkNWJkYmE1My02MDZmLTRkNDYtODg4ZC1hMWViNDRjZDVmNDEifSx7ImVuY3J5cHRlZF9rZXkiOiJiSWRsOFhoVmdobmc4Tis4cUZVbFRnPT0iLCJpZCI6ImFlZDQ5NjA5LTUwOTktNDExOC05YjA4LWI5NTM4ZGIwMGMwYyJ9LHsiZW5jcnlwdGVkX2tleSI6Ikp1SS9UMSt5cUtzUU95MjZEbzRuZmc9PSIsImlkIjoiN2I1YzFlOWYtZjhiOC00OTkyLWFhM2UtYTA4NWZjMzY3MzExIn0seyJlbmNyeXB0ZWRfa2V5IjoiM2ladUZxalh3bzhiN1lkamxKZUVPUT09IiwiaWQiOiI1YmU0MGViZi0yZWE0LTQ5ZmItYjZlYy1iMDlkZTVhYjYxN2YifSx7ImVuY3J5cHRlZF9rZXkiOiJoQ3gybzJxQlJKL2hiZVNqKzY5dHF3PT0iLCJpZCI6ImU1MzBkZjFiLWZmN2UtNDJhNC1iNTNhLThkNmRlNjhmMDAxMCJ9LHsiZW5jcnlwdGVkX2tleSI6IjhveWlGM0pQTmdzd0tPajVrWjVIT0E9PSIsImlkIjoiYjk0OTg3NDUtODJlYS00ZmZhLWFiMmItZDczN2VmNTRmODYzIn0seyJlbmNyeXB0ZWRfa2V5IjoiTEs4TENTY28zQmZYZXhLMlh0WUZSQT09IiwiaWQiOiI0ZjUyOTc1Yi1lOWYzLTRmZDctYmI4OS00MDNiMjgwMGU4Y2YifV0sInR5cGUiOiJlbnRpdGxlbWVudF9tZXNzYWdlIn0sImNvbV9rZXlfaWQiOiJiMzM2NGViNS01MWY2LTRhZTMtOGM5OC0zM2NlZDVlMzFjNzgiLCJ2ZXJzaW9uIjoxfQ.kuZip7wOBZ6-FjAO_VcBq0r816426dFK4fTdfm99NqE"
-              }
-            }
-          }
-        },
-        {
-          "name": "Complex multi-period with different content, clear",
-          "url": "https://media.axprod.net/TestVectors/v8-MultiContent/Clear/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors"
-        }
-      ]
-    },
-    {
-      "name": "Axinom Test Content (conservative/legacy)",
-      "submenu": [
-        {
-          "name": "1080p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              },
-              "audioRobustness": "SW_SECURE_CRYPTO",
-              "videoRobustness": "SW_SECURE_DECODE"
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/Manifest_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "2160p with PlayReady and Widevine DRM, single key",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMTUzMGQzYTAtNjkwNC00NDZhLTkxYTEtMzNhMTE1YWE4YzQxIn0seyJpZCI6ImM4M2ViNjM5LWU2NjQtNDNmOC1hZTk4LTQwMzliMGMxM2IyZCJ9LHsiaWQiOiIzZDhjYzc2Mi0yN2FjLTQwMGYtOTg5Zi04YWI1ZGM3ZDc3NzUifSx7ImlkIjoiYmQ4ZGFkNTgtMDMyZC00YzI1LTg5ZmEtYzdiNzEwZTgyYWMyIn1dfX0.9t18lFmZFVHMzpoZxYDyqOS0Bk_evGhTBw_F2JnAK2k"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 1080p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey-MultiPeriod/Manifest_1080p.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 1080p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/MultiPeriod_Manifest_1080p.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 2160p with PlayReady and Widevine DRM, multiple keys",
-          "url": "https://media.axprod.net/TestVectors/v6.1-MultiDRM-MultiKey-MultiPeriod/Manifest.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "https://drm-widevine-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              }
-            },
-            "com.microsoft.playready": {
-              "serverURL": "https://drm-playready-licensing.axtest.net/AcquireLicense",
-              "httpRequestHeaders": {
-                "X-AxDRM-Message": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNTNiZTc3NTctNzI4OC00YjZiLWIyMGEtZjA1YjY0YTRlZjc5In0seyJpZCI6IjBlZDgyMWE4LTgwZWQtNDBhYy1hODA0LTkyN2M5ZmRhZGJlOSJ9LHsiaWQiOiJlNDdkNzhjYS05NGRjLTQ1ZmItOWUzZC0yYTc3M2FlZjc0YjIifSx7ImlkIjoiMzJhMTQxZTktMjNhYi00NGZmLWE2YzctNTM0OWM4OTQ1MWNmIn0seyJpZCI6IjhkMDkxOTY2LTQ0YjUtNGNmOC04YTQ1LWVkMTJmZGIxOGQzNSJ9XX19.9YSK6QsDr4SYR7Q74ftq9mVtsT0ZkP3STE0zI-3mVIA"
-              }
-            }
-          },
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        },
-        {
-          "name": "Multi-period 2160p without encryption",
-          "url": "https://media.axprod.net/TestVectors/v6.1-Clear/MultiPeriod_Manifest.mpd",
-          "moreInfo": "https://github.com/Axinom/dash-test-vectors/tree/conservative"
-        }
-      ]
-    },
-    {
-      "name": "BBC R&D Test Content",
-      "submenu": [
-        {
-          "name": "BBC R&D Testcard",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-events.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/testcard/"
-        },
-        {
-          "name": "BBC R&D EBU-TT-D Subtitling Test",
-          "url": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/1/client_manifest-all.mpd",
-          "moreInfo": "http://rdmedia.bbc.co.uk/dash/ondemand/elephants_dream/"
-        }
-      ]
-    },
-    {
-      "name": "Microsoft Test Content",
-      "submenu": [
-        {
-          "name": "Microsoft AZURE MEDIA SERVICES ON DEMAND H264 AAC 4K CENC PLAYREADY 2.0",
-          "url": "http://profficialsite.origin.mediaservices.windows.net/c51358ea-9a5e-4322-8951-897d640fdfd7/tearsofsteel_4k.ism/manifest(format=mpd-time-csf)",
-          "protData": {
-            "com.microsoft.playready": {
-              "serverURL": "http://test.playready.microsoft.com/service/rightsmanager.asmx"
-            }
-          }
-        },
-        {
-          "name": "Source: XBox One commercial video",
-          "url": "http://profficialsite.origin.mediaservices.windows.net/9cc5e871-68ec-42c2-9fc7-fda95521f17d/dayoneplayready.ism/manifest(format=mpd-time-csf)",
-          "protData": {
-            "com.microsoft.playready": {
-              "serverURL": "http://test.playready.microsoft.com/service/rightsmanager.asmx"
-            }
-          }
-        },
-        {
-          "name": "AZURE MEDIA SERVICES LIVE PLAYREADY 2.0",
-          "url": "http://profficialsite.origin.mediaservices.windows.net/9cc5e871-68ec-42c2-9fc7-fda95521f17d/dayoneplayready.ism/manifest(format=mpd-time-csf)",
-          "protData": {
-            "com.microsoft.playready": {
-              "serverURL": "http://test.playready.microsoft.com/service/rightsmanager.asmx"
-            }
-          }
-        }
-      ]
-    },
-    {
-      "name": "Wowza Test Content",
-      "submenu": [
-        {
-          "name": "Clear Dynamic SegmentTimeline",
-          "url": "http://wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvtime.mpd"
-        },
-        {
-          "name": "Clear Dynamic SegmentTemplate",
-          "url": "http://wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvnumber.mpd"
-        },
-        {
-          "name": "Clear Dynamic SegmentList",
-          "url": "http://wowzaec2demo.streamlock.net/live/bigbuckbunny/manifest_mvlist.mpd"
-        },
-        {
-          "name": "Clear Static SegmentTimeline",
-          "url": "http://wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvtime.mpd"
-        },
-        {
-          "name": "Clear Static SegmentTemplate",
-          "url": "http://wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvnumber.mpd"
-        },
-        {
-          "name": "Clear Static SegmentList",
-          "url": "http://wowzaec2demo.streamlock.net/vod/_definst_/ElephantsDream/smil:ElephantsDream.smil/manifest_mvlist.mpd"
-        },
-        {
-          "name": "Widevine Dynamic SegmentTimeline",
-          "url": "http://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvtime.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "http://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Dynamic SegmentTemplate",
-          "url": "http://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvnumber.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "http://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Dynamic SegmentList",
-          "url": "http://wowzaec2demo.streamlock.net/live/bigbuckbunny-enc-wv.stream/manifest_mvlist.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "http://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Static SegmentTimeline",
-          "url": "http://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvtime.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "http://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Static SegmentTemplate",
-          "url": "http://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvnumber.mpd",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "http://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        },
-        {
-          "name": "Widevine Static SegmentList",
-          "url": "http://wowzaec2demo.streamlock.net/vod/elephantsdream_1100kbps-enc-wv.mp4/manifest_mvlist.mpd ",
-          "protData": {
-            "com.widevine.alpha": {
-              "serverURL": "http://widevine-proxy.appspot.com/proxy"
-            }
-          }
-        }
-      ]
-    },
-    {
-      "name": "D-DASH Test Content",
-      "submenu": [
-        {
-          "name": "D-Dash #1",
-          "url": "http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?segmentlength=2&type=full"
-        },
-        {
-          "name": "D-Dash #2",
-          "url": "http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?segmentlength=4&type=full"
-        },
-        {
-          "name": "D-Dash #3",
-          "url": "http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?segmentlength=6&type=full"
-        },
-        {
-          "name": "D-Dash #4",
-          "url": "http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?segmentlength=8&type=full"
-        },
-        {
-          "name": "D-Dash #5",
-          "url": "http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?segmentlength=10&type=full"
-        },
-        {
-          "name": "D-Dash #6",
-          "url": "http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?segmentlength=15&type=full"
-        }
-      ]
-    },
-    {
-      "name": "Other samples",
-      "submenu": [
-        {
-          "name": "4K",
-          "url": "https://dash.akamaized.net/akamai/streamroot/050714/Spring_4Ktest.mpd"
-        },
-        {
-          "name": "Segment List",
-          "url": "http://www.digitalprimates.net/dash/streams/gpac/mp4-main-multi-mpd-AV-NBS.mpd"
-        },
-        {
-          "name": "Segment Template",
-          "url": "http://www.digitalprimates.net/dash/streams/mp4-live-template/mp4-live-mpd-AV-BS.mpd"
-        },
-        {
-          "name": "Unified Streaming - Timeline",
-          "url": "http://demo.unified-streaming.com/video/ateam/ateam.ism/ateam.mpd"
-        },
-        {
-          "name": "Unified Streaming Live",
-          "url": "https://live.unified-streaming.com/smptebitc/smptebitc.isml/.mpd"
-        },
-        {
-          "name": "Unified Streaming (Widevine, persistent)",
-          "url": "http://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-dash-widevine.ism/.mpd",
-          "protData": {
-              "com.widevine.alpha": {
-                  "serverURL": "https://cwip-shaka-proxy.appspot.com/no_auth",
-                  "sessionType": "persistent-license"
-              }
-          }
-        }
-      ]
-    },
-    {
-      "name": "Smooth Streaming",
-      "submenu": [
-        {
-          "url": "http://2is7server2.rd.francetelecom.com/hasplayer/VOD_1/VOD_1.ism/manifest",
-          "name": "Prince Of Persia"
-        },
-        {
-          "url": "http://2is7server2.rd.francetelecom.com/hasplayer/LIVE_1.isml/manifest",
-          "name": "Prince Of Persia - Live",
-          "bufferConfig" : {
-            "liveDelay": 16,
-            "stableBufferTime": 16,
-            "bufferTimeAtTopQuality": 16,
-            "bufferTimeAtTopQualityLongForm": 16
-          }
-        },
-        {
-          "url": "http://2is7server1.rd.francetelecom.com/C4/C4-50_TVApp2.isml/Manifest",
-          "name": "Arte (subtitles)",
-          "bufferConfig" : {
-            "liveDelay": 16,
-            "stableBufferTime": 16,
-            "bufferTimeAtTopQuality": 16,
-            "bufferTimeAtTopQualityLongForm": 16
-          }
-        },
-        {
-          "url": "http://2is7server1.rd.francetelecom.com/VOD/BBB-SD/big_buck_bunny_1080p_stereo.ism/Manifest",
-          "name": "Big Buck Bunny"
-        },
-        {
-          "url": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism/Manifest",
-          "name": "Super Speedway"
-        },
-        {
-          "url": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism/Manifest",
-          "name": "Super Speedway + PlayReady DRM"
-        }
-      ]
-    }
-  ]
-}
diff --git a/samples/offline/index.html b/samples/offline/index.html
index 33bec65085..a70c377fd5 100644
--- a/samples/offline/index.html
+++ b/samples/offline/index.html
@@ -313,7 +313,7 @@
             <div class="container col-md-4">
                 <!-- DOWNLOAD SECTION -->
                 <div class="download-list">
-                    <h2>Downloads</h2>
+                    <h2>Records</h2>
                     <h4 ng-if="downloads.length ===0">No available offline streams</h4>
                     <div ng-repeat="download in downloads">
                         <dash-download download="download" on-load="onLoadDownload" on-created="onCreated"></dash-download>
@@ -340,20 +340,33 @@ <h5 class="modal-title">Select Your Downloading Representations</h5>
                     <div class="modal-body">
                         <form>
                             <div class="form-group" >
-                                <div class="qualityLabelTitle">Video :</div>
-                                <div ng-repeat="media in downloadableRepresentations.video">
-                                    <input type="checkbox" name="video" value="{{media.id}}" ng-model="media.selected"/>
-                                    {{media.id}} ({{media.width}} x {{media.height}}) : {{media.bandwidth}} bits
+                                <div ng-repeat="media in mediaInfos | filter:{ type: 'video' }">
+                                    <div class="qualityLabelTitle">Video {{media.id}} ({{media.codec}}):</div>
+                                    <div ng-repeat="bitrate in media.bitrateList">
+                                        <input type="checkbox" name="video" value="{{bitrate.id}}" ng-model="bitrate.selected"/>
+                                        {{bitrate.width}}x{{bitrate.height}}@{{bitrate.bandwidth}}bps
+                                    </div>
                                 </div>
-                                <div class="qualityLabelTitle">Audio :</div>
-                                <div ng-repeat="media in downloadableRepresentations.audio">
-                                    <input type="checkbox" name="audio" value="{{media.id}}" ng-model="media.selected"/>
-                                    {{media.id}} ({{media.lang}}) : {{media.bandwidth}} bits
+                                <div ng-repeat="media in mediaInfos | filter:{ type: 'audio' }">
+                                    <div class="qualityLabelTitle">Audio {{media.id}}, {{media.lang}} ({{media.codec}}):</div>
+                                    <div ng-repeat="bitrate in media.bitrateList">
+                                        <input type="checkbox" name="audio" value="{{bitrate.id}}" ng-model="bitrate.selected"/>
+                                        {{bitrate.bandwidth}}bps
+                                    </div>
                                 </div>
-                                <div class="qualityLabelTitle">Text :</div>
-                                <div ng-repeat="media in downloadableRepresentations.text">
-                                    <input type="checkbox" name="text" value="{{media.id}}" ng-model="media.selected"/>
-                                    {{media.id}} ({{media.lang}}) : {{media.kind}} ({{media.type}})
+                                <div ng-repeat="media in mediaInfos | filter:{ type: 'text' }">
+                                    <div class="qualityLabelTitle">Text {{media.id}}, {{media.lang}} ({{media.codec}}):</div>
+                                    <div ng-repeat="bitrate in media.bitrateList">
+                                        <input type="checkbox" name="text" value="{{bitrate.id}}" ng-model="bitrate.selected"/>
+                                        {{bitrate.bandwidth}}bps
+                                    </div>
+                                </div>
+                                <div ng-repeat="media in mediaInfos | filter:{ type: 'fragmentedText' }">
+                                    <div class="qualityLabelTitle">Text {{media.id}}, {{media.lang}} ({{media.codec}}):</div>
+                                    <div ng-repeat="bitrate in media.bitrateList">
+                                        <input type="checkbox" name="fragmentedText" value="{{bitrate.id}}" ng-model="bitrate.selected"/>
+                                        {{bitrate.bandwidth}}bps
+                                    </div>
                                 </div>
                             </div>
                         </form>
diff --git a/samples/offline/manifest.json b/samples/offline/manifest.json
index 00231686c8..8371150b64 100644
--- a/samples/offline/manifest.json
+++ b/samples/offline/manifest.json
@@ -1,6 +1,6 @@
 {
-    "short_name": "Offline Dash.JS",
-    "name": "Offline Dash.JS Sample",
+    "short_name": "Offline dash.js",
+    "name": "Offline dash.js sample",
     "icons": [
         {
         "src": "./app/img/icons/48x48.png",
diff --git a/samples/offline/service-worker.js b/samples/offline/service-worker.js
index 204acfa538..f91dea9b53 100644
--- a/samples/offline/service-worker.js
+++ b/samples/offline/service-worker.js
@@ -47,7 +47,7 @@ let urlsToCache = [
     'app/rules/ThroughputRule.js',
     'app/contributors.json',
     'app/main.js',
-    'app/sources.json',
+    '../dash-if-reference-player/app/sources.json',
     '../../contrib/akamai/controlbar/controlbar.css',
     '../../contrib/akamai/controlbar/ControlBar.js',
     '../../contrib/akamai/controlbar/icomoon.ttf',
diff --git a/src/core/Settings.js b/src/core/Settings.js
index ae9c1107c2..4b6b932fbe 100644
--- a/src/core/Settings.js
+++ b/src/core/Settings.js
@@ -87,7 +87,8 @@ import {HTTPRequest} from '../streaming/vo/metrics/HTTPRequest';
  *              IndexSegment: 1000,
  *              MediaSegment: 1000,
  *              BitstreamSwitchingSegment: 1000,
- *              other: 1000
+ *              other: 1000,
+ *              lowLatencyReductionFactor: 10
  *          },
  *          retryAttempts: {
  *              MPD: 3,
@@ -96,7 +97,8 @@ import {HTTPRequest} from '../streaming/vo/metrics/HTTPRequest';
  *              IndexSegment: 3,
  *              MediaSegment: 3,
  *              BitstreamSwitchingSegment: 3,
- *              other: 3
+ *              other: 3,
+ *              lowLatencyMultiplyFactor: 5
  *          },
  *          abr: {
  *              movingAverageMethod: Constants.MOVING_AVERAGE_SLIDING_WINDOW,
@@ -294,13 +296,22 @@ import {HTTPRequest} from '../streaming/vo/metrics/HTTPRequest';
  *
  * Note: Catch-up mechanism is only applied when playing low latency live streams.
  * @property {number} [liveCatchUpPlaybackRate=0.5]
- * Use this method to set the maximum catch up rate, as a percentage, for low latency live streams. In low latency mode,
+ * Use this parameter to set the maximum catch up rate, as a percentage, for low latency live streams. In low latency mode,
  * when measured latency is higher/lower than the target one,
  * dash.js increases/decreases playback rate respectively up to (+/-) the percentage defined with this method until target is reached.
  *
  * Valid values for catch up rate are in range 0-0.5 (0-50%). Set it to 0 to turn off live catch up feature.
  *
  * Note: Catch-up mechanism is only applied when playing low latency live streams.
+ * @property {number} [liveCatchupLatencyThreshold=NaN]
+ * Use this parameter to set the maximum threshold for which live catch up is applied. For instance, if this value is set to 8 seconds,
+ * then live catchup is only applied if the current live latency is equal or below 8 seconds. The reason behind this parameter is to avoid an increase
+ * of the playback rate if the user seeks within the DVR window.
+ *
+ * If no value is specified this will be twice the maximum live delay. The maximum live delay is either specified in the manifest as part of a ServiceDescriptor or calculated the following:
+ * maximumLiveDelay = targetDelay + liveCatchupMinDrift
+ *
+ * Note: Catch-up mechanism is only applied when playing low latency live streams.
  * @property {module:Settings~CachingInfoSettings} [lastBitrateCachingInfo={enabled: true, ttl: 360000}]
  * Set to false if you would like to disable the last known bit rate from being stored during playback and used
  * to set the initial bit rate for subsequent playback within the expiration window.
@@ -316,8 +327,8 @@ import {HTTPRequest} from '../streaming/vo/metrics/HTTPRequest';
  * @property {module:Settings~AudioVideoSettings} [cacheLoadThresholds={video: 50, audio: 5}]
  * For a given media type, the threshold which defines if the response to a fragment
  * request is coming from browser cache or not.
- * @property {module:Settings~RequestTypeSettings} [retryIntervals] Time in milliseconds of which to reload a failed file load attempt.
- * @property {module:Settings~RequestTypeSettings} [retryAttempts] Total number of retry attempts that will occur on a file load before it fails.
+ * @property {module:Settings~RequestTypeSettings} [retryIntervals] Time in milliseconds of which to reload a failed file load attempt. For low latency mode these values are divided by lowLatencyReductionFactor.
+ * @property {module:Settings~RequestTypeSettings} [retryAttempts] Total number of retry attempts that will occur on a file load before it fails. For low latency mode these values are multiplied by lowLatencyMultiplyFactor.
  * @property {module:Settings~AbrSettings} abr Adaptive Bitrate algorithm related settings.
  * @property {module:Settings~CmcdSettings} cmcd  Settings related to Common Media Client Data reporting.
  */
@@ -396,6 +407,7 @@ function Settings() {
             liveCatchUpMinDrift: 0.02,
             liveCatchUpMaxDrift: 0,
             liveCatchUpPlaybackRate: 0.5,
+            liveCatchupLatencyThreshold: NaN,
             lastBitrateCachingInfo: {enabled: true, ttl: 360000},
             lastMediaSettingsCachingInfo: {enabled: true, ttl: 360000},
             cacheLoadThresholds: {video: 50, audio: 5},
@@ -406,7 +418,8 @@ function Settings() {
                 [HTTPRequest.INIT_SEGMENT_TYPE]: 1000,
                 [HTTPRequest.BITSTREAM_SWITCHING_SEGMENT_TYPE]: 1000,
                 [HTTPRequest.INDEX_SEGMENT_TYPE]: 1000,
-                [HTTPRequest.OTHER_TYPE]: 1000
+                [HTTPRequest.OTHER_TYPE]: 1000,
+                lowLatencyReductionFactor: 10
             },
             retryAttempts: {
                 [HTTPRequest.MPD_TYPE]: 3,
@@ -415,7 +428,8 @@ function Settings() {
                 [HTTPRequest.INIT_SEGMENT_TYPE]: 3,
                 [HTTPRequest.BITSTREAM_SWITCHING_SEGMENT_TYPE]: 3,
                 [HTTPRequest.INDEX_SEGMENT_TYPE]: 3,
-                [HTTPRequest.OTHER_TYPE]: 3
+                [HTTPRequest.OTHER_TYPE]: 3,
+                lowLatencyMultiplyFactor: 5
             },
             abr: {
                 movingAverageMethod: Constants.MOVING_AVERAGE_SLIDING_WINDOW,
diff --git a/src/core/Version.js b/src/core/Version.js
index 966b6598fd..343aaa28db 100644
--- a/src/core/Version.js
+++ b/src/core/Version.js
@@ -1,4 +1,4 @@
-const VERSION = '3.1.1';
+const VERSION = '3.1.2';
 export function getVersionString() {
     return VERSION;
 }
diff --git a/src/core/events/CoreEvents.js b/src/core/events/CoreEvents.js
index 23771fe21e..fc581abc7d 100644
--- a/src/core/events/CoreEvents.js
+++ b/src/core/events/CoreEvents.js
@@ -52,7 +52,7 @@ class CoreEvents extends EventsBase {
         this.INBAND_EVENTS = 'inbandEvents';
         this.INITIALIZATION_LOADED = 'initializationLoaded';
         this.INIT_FRAGMENT_LOADED = 'initFragmentLoaded';
-        this.INIT_REQUESTED = 'initRequested';
+        this.INIT_FRAGMENT_NEEDED = 'initFragmentNeeded';
         this.INTERNAL_MANIFEST_LOADED = 'internalManifestLoaded';
         this.ORIGINAL_MANIFEST_LOADED = 'originalManifestLoaded';
         this.LIVE_EDGE_SEARCH_COMPLETED = 'liveEdgeSearchCompleted';
@@ -62,6 +62,7 @@ class CoreEvents extends EventsBase {
         this.LOADING_ABANDONED = 'loadingAborted';
         this.MANIFEST_UPDATED = 'manifestUpdated';
         this.MEDIA_FRAGMENT_LOADED = 'mediaFragmentLoaded';
+        this.MEDIA_FRAGMENT_NEEDED = 'mediaFragmentNeeded';
         this.QUOTA_EXCEEDED = 'quotaExceeded';
         this.REPRESENTATION_UPDATE_STARTED = 'representationUpdateStarted';
         this.REPRESENTATION_UPDATE_COMPLETED = 'representationUpdateCompleted';
@@ -73,7 +74,6 @@ class CoreEvents extends EventsBase {
         this.STREAM_BUFFERING_COMPLETED = 'streamBufferingCompleted';
         this.STREAM_COMPLETED = 'streamCompleted';
         this.TEXT_TRACKS_QUEUE_INITIALIZED = 'textTracksQueueInitialized';
-        this.TIMED_TEXT_REQUESTED = 'timedTextRequested';
         this.TIME_SYNCHRONIZATION_COMPLETED = 'timeSynchronizationComplete';
         this.URL_RESOLUTION_FAILED = 'urlResolutionFailed';
         this.VIDEO_CHUNK_RECEIVED = 'videoChunkReceived';
@@ -82,6 +82,8 @@ class CoreEvents extends EventsBase {
         this.XLINK_READY = 'xlinkReady';
         this.SEGMENTBASE_INIT_REQUEST_NEEDED = 'segmentBaseInitRequestNeeded';
         this.SEGMENTBASE_SEGMENTSLIST_REQUEST_NEEDED = 'segmentBaseSegmentsListRequestNeeded';
+        this.SEEK_TARGET = 'seekTarget';
+        this.DYNAMIC_STREAM_COMPLETED = 'dynamicStreamCompleted';
     }
 }
 
diff --git a/src/dash/DashAdapter.js b/src/dash/DashAdapter.js
index cee42a7208..8aaed7a33d 100644
--- a/src/dash/DashAdapter.js
+++ b/src/dash/DashAdapter.js
@@ -38,6 +38,10 @@ import Event from './vo/Event';
 import FactoryMaker from '../core/FactoryMaker';
 import DashManifestModel from './models/DashManifestModel';
 
+/**
+ * @module DashAdapter
+ */
+
 function DashAdapter() {
     let instance,
         dashManifestModel,
@@ -86,6 +90,14 @@ function DashAdapter() {
         }
     }
 
+    /**
+     * Creates an instance of RepresentationInfo based on a representation value object
+     * @param {object} voRepresentation
+     * @returns {RepresentationInfo|null} representationInfo
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function convertRepresentationToRepresentationInfo(voRepresentation) {
         if (voRepresentation) {
             let representationInfo = new RepresentationInfo();
@@ -107,6 +119,14 @@ function DashAdapter() {
         }
     }
 
+    /**
+     * Returns a MediaInfo object for a given media type.
+     * @param {object} streamInfo
+     * @param {MediaType }type
+     * @returns {null|MediaInfo} mediaInfo
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getMediaInfoForType(streamInfo, type) {
         if (voPeriods.length === 0 || !streamInfo) {
             return null;
@@ -125,12 +145,28 @@ function DashAdapter() {
         return convertAdaptationToMediaInfo(voAdaptations[periodId][idx]);
     }
 
+    /**
+     * Checks if the role of the specified AdaptationSet is set to main
+     * @param {object} adaptation
+     * @returns {boolean}
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getIsMain(adaptation) {
         return dashManifestModel.getRolesForAdaptation(adaptation).filter(function (role) {
             return role.value === DashConstants.MAIN;
         })[0];
     }
 
+    /**
+     * Returns the AdaptationSet for a given period and a given mediaType.
+     * @param {number} periodIndex
+     * @param {MediaType} type
+     * @param {object} streamInfo
+     * @returns {null|object} adaptation
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getAdaptationForType(periodIndex, type, streamInfo) {
         const adaptations = dashManifestModel.getAdaptationsForType(voPeriods[0].mpd.manifest, periodIndex, type);
 
@@ -157,6 +193,15 @@ function DashAdapter() {
         return adaptations[0];
     }
 
+    /**
+     * Returns the mediaInfo for a given mediaType
+     * @param {object} streamInfo
+     * @param {MediaType} type
+     * @param {object} externalManifest Set to null or undefined if no external manifest is to be used
+     * @returns {Array} mediaArr
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getAllMediaInfoForType(streamInfo, type, externalManifest) {
         let voLocalPeriods = voPeriods;
         let manifest = externalManifest;
@@ -243,6 +288,13 @@ function DashAdapter() {
         return mediaArr;
     }
 
+    /**
+     * @param {object} newManifest
+     * @returns {*}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function updatePeriods(newManifest) {
         if (!newManifest) return null;
 
@@ -253,6 +305,14 @@ function DashAdapter() {
         voAdaptations = {};
     }
 
+    /**
+     * @param {object} externalManifest
+     * @param {number} maxStreamsInfo
+     * @returns {Array} streams
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getStreamsInfo(externalManifest, maxStreamsInfo) {
         const streams = [];
         let voLocalPeriods = voPeriods;
@@ -275,6 +335,14 @@ function DashAdapter() {
         return streams;
     }
 
+    /**
+     *
+     * @param {object} streamInfo
+     * @param {object} mediaInfo
+     * @returns {object} realAdaptation
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getRealAdaptation(streamInfo, mediaInfo) {
         let id,
             realAdaptation;
@@ -290,6 +358,13 @@ function DashAdapter() {
         return realAdaptation;
     }
 
+    /**
+     * Returns all voRepresentations for a given mediaInfo
+     * @param {object} mediaInfo
+     * @returns {Array} voReps
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getVoRepresentations(mediaInfo) {
         let voReps;
 
@@ -299,6 +374,16 @@ function DashAdapter() {
         return voReps;
     }
 
+    /**
+     *
+     * @param {object} eventBox
+     * @param {Array} eventStreams
+     * @param {number} startTime
+     * @returns {null|Event}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getEvent(eventBox, eventStreams, startTime) {
         if (!eventBox || !eventStreams) {
             return null;
@@ -327,6 +412,15 @@ function DashAdapter() {
         return event;
     }
 
+    /**
+     *
+     * @param {object} info
+     * @param {object} voRepresentation
+     * @returns {Array}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getEventsFor(info, voRepresentation) {
         let events = [];
 
@@ -345,80 +439,207 @@ function DashAdapter() {
         return events;
     }
 
+    /**
+     *
+     * @param {number} streamId
+     * @param {MediaType} type
+     * @param {object} mediaInfo
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function setCurrentMediaInfo(streamId, type, mediaInfo) {
         currentMediaInfo[streamId] = currentMediaInfo[streamId] || {};
         currentMediaInfo[streamId][type] = currentMediaInfo[streamId][type] || {};
         currentMediaInfo[streamId][type] = mediaInfo;
     }
 
+    /**
+     *
+     * @param {String} type
+     * @returns {boolean}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getIsTextTrack(type) {
         return dashManifestModel.getIsTextTrack(type);
     }
 
+    /**
+     * Returns the UTC Timing Sources specified in the manifest
+     * @returns {Array} utcTimingSources
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getUTCTimingSources() {
         const manifest = getManifest();
         return dashManifestModel.getUTCTimingSources(manifest);
     }
 
+    /**
+     * Returns the suggestedPresentationDelay as specified in the manifest
+     * @returns {String} suggestedPresentationDelay
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getSuggestedPresentationDelay() {
         const mpd = voPeriods.length > 0 ? voPeriods[0].mpd : null;
         return dashManifestModel.getSuggestedPresentationDelay(mpd);
     }
 
+    /**
+     * Returns the availabilityStartTime as specified in the manifest
+     * @param {object} externalManifest Omit this value if no external manifest should be used
+     * @returns {string} availabilityStartTime
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getAvailabilityStartTime(externalManifest) {
         const mpd = getMpd(externalManifest);
         return dashManifestModel.getAvailabilityStartTime(mpd);
     }
 
+    /**
+     * Returns a boolean indicating if the manifest is dynamic or not
+     * @param {object} externalManifest Omit this value if no external manifest should be used
+     * @returns {boolean}
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getIsDynamic(externalManifest) {
         const manifest = getManifest(externalManifest);
         return dashManifestModel.getIsDynamic(manifest);
     }
 
+    /**
+     * Returns the duration of the MPD
+     * @param {object} externalManifest Omit this value if no external manifest should be used
+     * @returns {number} duration
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getDuration(externalManifest) {
         const manifest = getManifest(externalManifest);
         return dashManifestModel.getDuration(manifest);
     }
 
+    /**
+     * Returns all periods of the MPD
+     * @param {object} externalManifest Omit this value if no external manifest should be used
+     * @returns {Array} periods
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getRegularPeriods(externalManifest) {
         const mpd = getMpd(externalManifest);
         return dashManifestModel.getRegularPeriods(mpd);
     }
 
+    /**
+     * Returns an MPD object
+     * @param {object} externalManifest Omit this value if no external manifest should be used
+     * @returns {object} MPD
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getMpd(externalManifest) {
         const manifest = getManifest(externalManifest);
         return dashManifestModel.getMpd(manifest);
     }
 
+    /**
+     * Returns the location element of the MPD
+     * @param {object} manifest
+     * @returns {String} location
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getLocation(manifest) {
         return dashManifestModel.getLocation(manifest);
     }
 
+    /**
+     * Returns the manifest update period used for dynamic manifests
+     * @param {object} manifest
+     * @param {number} latencyOfLastUpdate
+     * @returns {NaN|number} manifestUpdatePeriod
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getManifestUpdatePeriod(manifest, latencyOfLastUpdate = 0) {
         return dashManifestModel.getManifestUpdatePeriod(manifest, latencyOfLastUpdate);
     }
 
+    /**
+     *
+     * @param {object} mediaInfo
+     * @returns {boolean}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getUseCalculatedLiveEdgeTimeForMediaInfo(mediaInfo) {
         const voAdaptation = getAdaptationForMediaInfo(mediaInfo);
         return dashManifestModel.getUseCalculatedLiveEdgeTimeForAdaptation(voAdaptation);
     }
 
+    /**
+     * Checks if the manifest has a DVB profile
+     * @param {object} manifest
+     * @returns {boolean}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getIsDVB(manifest) {
         return dashManifestModel.hasProfile(manifest, PROFILE_DVB);
     }
 
+    /**
+     *
+     * @param {object} node
+     * @returns {Array}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getBaseURLsFromElement(node) {
         return dashManifestModel.getBaseURLsFromElement(node);
     }
 
+    /**
+     *
+     * @returns {*}
+     * @memberOf module:DashAdapter
+     * @instance
+     * @ignore
+     */
     function getRepresentationSortFunction() {
         return dashManifestModel.getRepresentationSortFunction();
     }
 
+    /**
+     * Returns the codec for a given adaptation set and a given representation id.
+     * @param {object} adaptation
+     * @param {number} representationId
+     * @param {boolean} addResolutionInfo Defines whether to include resolution information in the output
+     * @returns {String} codec
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getCodec(adaptation, representationId, addResolutionInfo) {
         return dashManifestModel.getCodec(adaptation, representationId, addResolutionInfo);
     }
 
+    /**
+     * Returns the bandwidth for a given representation id
+     * @param {number} representationId
+     * @param {number} periodId
+     * @returns {number} bandwidth
+     * @memberOf module:DashAdapter
+     * @instance
+     */
     function getBandwidthForRepresentation(representationId, periodId) {
         let representation;
         let period = getPeriod(periodId);
@@ -429,10 +650,12 @@ function DashAdapter() {
     }
 
     /**
-     *
+     * Returns the index for a given representation id
      * @param {string} representationId
      * @param {number} periodIdx
-     * @returns {*}
+     * @returns {number} index
+     * @memberOf module:DashAdapter
+     * @instance
      */
     function getIndexForRepresentation(representationId, periodIdx) {
         let period = getPeriod(periodIdx);
@@ -460,6 +683,7 @@ function DashAdapter() {
         voAdaptations = {};
         currentMediaInfo = {};
     }
+
     // #endregion PUBLIC FUNCTIONS
 
     // #region PRIVATE FUNCTIONS
@@ -521,7 +745,7 @@ function DashAdapter() {
             return audioChannelConfiguration.value;
         });
 
-        if (mediaInfo.audioChannelConfiguration.length === 0 && Array.isArray(realAdaptation.Representation_asArray) && realAdaptation.Representation_asArray.length > 0 ) {
+        if (mediaInfo.audioChannelConfiguration.length === 0 && Array.isArray(realAdaptation.Representation_asArray) && realAdaptation.Representation_asArray.length > 0) {
             mediaInfo.audioChannelConfiguration = dashManifestModel.getAudioChannelConfigurationForRepresentation(realAdaptation.Representation_asArray[0]).map(function (audioChannelConfiguration) {
                 return audioChannelConfiguration.value;
             });
@@ -586,6 +810,7 @@ function DashAdapter() {
         manifestInfo.duration = dashManifestModel.getDuration(mpd.manifest);
         manifestInfo.isDynamic = dashManifestModel.getIsDynamic(mpd.manifest);
         manifestInfo.serviceDescriptions = dashManifestModel.getServiceDescriptions(mpd.manifest);
+        manifestInfo.protocol = mpd.manifest.protocol;
 
         return manifestInfo;
     }
@@ -654,6 +879,7 @@ function DashAdapter() {
 
         return -1;
     }
+
     // #endregion PRIVATE FUNCTIONS
 
     instance = {
diff --git a/src/dash/DashHandler.js b/src/dash/DashHandler.js
index fd2db30e76..f6698d9eaf 100644
--- a/src/dash/DashHandler.js
+++ b/src/dash/DashHandler.js
@@ -64,6 +64,7 @@ function DashHandler(config) {
         requestedTime,
         currentTime,
         isDynamicManifest,
+        dynamicStreamCompleted,
         selectedMimeType,
         segmentsController;
 
@@ -76,10 +77,12 @@ function DashHandler(config) {
         eventBus.on(events.INITIALIZATION_LOADED, onInitializationLoaded, instance);
         eventBus.on(events.SEGMENTS_LOADED, onSegmentsLoaded, instance);
         eventBus.on(events.REPRESENTATION_UPDATE_STARTED, onRepresentationUpdateStarted, instance);
+        eventBus.on(events.DYNAMIC_STREAM_COMPLETED, onDynamicStreamCompleted, instance);
     }
 
     function initialize(isDynamic) {
         isDynamicManifest = isDynamic;
+        dynamicStreamCompleted = false;
         segmentsController.initialize(isDynamic);
     }
 
@@ -126,6 +129,7 @@ function DashHandler(config) {
         eventBus.off(events.INITIALIZATION_LOADED, onInitializationLoaded, instance);
         eventBus.off(events.SEGMENTS_LOADED, onSegmentsLoaded, instance);
         eventBus.off(events.REPRESENTATION_UPDATE_STARTED, onRepresentationUpdateStarted, instance);
+        eventBus.off(events.DYNAMIC_STREAM_COMPLETED, onDynamicStreamCompleted, instance);
     }
 
     function setRequestUrl(request, destination, representation) {
@@ -255,7 +259,9 @@ function DashHandler(config) {
                 isFinished = true;
             }
         } else {
-            if (lastSegment) {
+            if (dynamicStreamCompleted) {
+                isFinished = true;
+            } else if (lastSegment) {
                 const time = parseFloat((lastSegment.presentationStartTime - representation.adaptation.period.start).toFixed(5));
                 const endTime = lastSegment.duration > 0 ? time + 1.5 * lastSegment.duration : time;
                 const duration = representation.adaptation.period.duration;
@@ -322,7 +328,7 @@ function DashHandler(config) {
 
         // check that there is a segment in this index
         const segment = segmentsController.getSegmentByIndex(representation, indexToRequest, lastSegment ? lastSegment.mediaStartTime : -1);
-        if (!segment && isEndlessMedia(representation)) {
+        if (!segment && isEndlessMedia(representation) && !dynamicStreamCompleted) {
             logger.debug('No segment found at index: ' + indexToRequest + '. Wait for next loop');
             return null;
         } else {
@@ -420,6 +426,11 @@ function DashHandler(config) {
         eventBus.trigger(events.REPRESENTATION_UPDATE_COMPLETED, {sender: this, representation: representation});
     }
 
+    function onDynamicStreamCompleted() {
+        logger.debug('Dynamic stream complete');
+        dynamicStreamCompleted = true;
+    }
+
     instance = {
         initialize: initialize,
         getType: getType, //need to be public in order to be used by logger
diff --git a/src/dash/DashMetrics.js b/src/dash/DashMetrics.js
index 4836a23ec5..7e623c3be6 100644
--- a/src/dash/DashMetrics.js
+++ b/src/dash/DashMetrics.js
@@ -41,7 +41,6 @@ import {
 
 /**
  * @module DashMetrics
- * @ignore
  * @param {object} config
  */
 
@@ -69,7 +68,7 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @returns {*}
      * @memberof module:DashMetrics
      * @instance
@@ -80,21 +79,23 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @param {Date} t time of the switch event
      * @param {Date} mt media presentation time
      * @param {string} to id of representation
      * @param {string} lto if present, subrepresentation reference
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addRepresentationSwitch(mediaType, t, mt, to, lto) {
         metricsModel.addRepresentationSwitch(mediaType, t, mt, to, lto);
     }
 
     /**
-     * @param {string} type
+     * @param {MediaType} type
      * @returns {number}
+     * @memberof module:DashMetrics
      * @instance
      */
     function getCurrentBufferState(type) {
@@ -103,7 +104,7 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} type
+     * @param {MediaType} type
      * @returns {number}
      * @memberof module:DashMetrics
      * @instance
@@ -120,22 +121,24 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @param {number} t
      * @param {number} level
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addBufferLevel(mediaType, t, level) {
         metricsModel.addBufferLevel(mediaType, t, level);
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @param {string} state
      * @param {number} target
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addBufferState(mediaType, state, target) {
         metricsModel.addBufferState(mediaType, state, target);
@@ -144,13 +147,14 @@ function DashMetrics(config) {
     /**
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function clearAllCurrentMetrics () {
         metricsModel.clearAllCurrentMetrics();
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @returns {*}
      * @memberof module:DashMetrics
      * @instance
@@ -184,7 +188,7 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @returns {*}
      * @memberof module:DashMetrics
      * @instance
@@ -199,11 +203,12 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @param {Array} loadingRequests
      * @param {Array} executedRequests
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addRequestsQueue(mediaType, loadingRequests, executedRequests) {
         metricsModel.addRequestsQueue(mediaType, loadingRequests, executedRequests);
@@ -228,6 +233,7 @@ function DashMetrics(config) {
      * @returns {*}
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function getCurrentDroppedFrames() {
         const metrics = metricsModel.getMetricsFor(Constants.VIDEO, true);
@@ -238,13 +244,14 @@ function DashMetrics(config) {
      * @param {number} quality
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addDroppedFrames(quality) {
         metricsModel.addDroppedFrames(Constants.VIDEO, quality);
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @returns {*}
      * @memberof module:DashMetrics
      * @instance
@@ -259,6 +266,7 @@ function DashMetrics(config) {
      * @param {string} state
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addSchedulingInfo(request, state) {
         metricsModel.addSchedulingInfo(
@@ -287,6 +295,7 @@ function DashMetrics(config) {
      * @param {object} updatedFields fields to be updated
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function updateManifestUpdateInfo(updatedFields) {
         const manifestUpdate = this.getCurrentManifestUpdate();
@@ -297,6 +306,7 @@ function DashMetrics(config) {
      * @param {object} streamInfo
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addManifestUpdateStreamInfo(streamInfo) {
         if (streamInfo) {
@@ -309,6 +319,7 @@ function DashMetrics(config) {
      * @param {object} request
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addManifestUpdate(request) {
         metricsModel.addManifestUpdate(Constants.STREAM, request.type, request.requestStartDate, request.requestEndDate);
@@ -322,6 +333,7 @@ function DashMetrics(config) {
      * @param {object} traces
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addHttpRequest(request, responseURL, responseStatus, responseHeaders, traces) {
         metricsModel.addHttpRequest(request.mediaType,
@@ -343,9 +355,10 @@ function DashMetrics(config) {
 
     /**
      * @param {object} representation
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addManifestUpdateRepresentationInfo(representation, mediaType) {
         if (representation) {
@@ -355,7 +368,7 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @returns {*}
      * @memberof module:DashMetrics
      * @instance
@@ -367,12 +380,13 @@ function DashMetrics(config) {
     }
 
     /**
-     * @param {string} mediaType
+     * @param {MediaType} mediaType
      * @param {Date} currentTime time of the switch event
      * @param {object} mpd mpd reference
      * @param {object} range range of the dvr info
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addDVRInfo(mediaType, currentTime, mpd, range) {
         metricsModel.addDVRInfo(mediaType, currentTime, mpd, range);
@@ -442,6 +456,7 @@ function DashMetrics(config) {
     /**
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addPlayList() {
         if (playListMetrics) {
@@ -466,7 +481,7 @@ function DashMetrics(config) {
             playListTraceMetrics.representationid = representationId;
             playListTraceMetrics.start = new Date();
             playListTraceMetrics.mstart = mediaStartTime;
-            playListTraceMetrics.playbackspeed = speed;
+            playListTraceMetrics.playbackspeed = speed !== null ? speed.toString() : null;
         }
     }
 
@@ -493,6 +508,7 @@ function DashMetrics(config) {
      * @param {object} errors
      * @memberof module:DashMetrics
      * @instance
+     * @ignore
      */
     function addDVBErrors(errors) {
         metricsModel.addDVBErrors(errors);
diff --git a/src/dash/constants/DashConstants.js b/src/dash/constants/DashConstants.js
index 521ff5489b..7b8e793996 100644
--- a/src/dash/constants/DashConstants.js
+++ b/src/dash/constants/DashConstants.js
@@ -103,6 +103,7 @@ class DashConstants {
         this.CONTENTPROTECTION_ASARRAY = 'ContentProtection_asArray';
         this.MAIN = 'main';
         this.DYNAMIC = 'dynamic';
+        this.STATIC = 'static';
         this.MEDIA_PRESENTATION_DURATION = 'mediaPresentationDuration';
         this.MINIMUM_UPDATE_PERIOD = 'minimumUpdatePeriod';
         this.CODEC_PRIVATE_DATA = 'codecPrivateData';
diff --git a/src/dash/controllers/RepresentationController.js b/src/dash/controllers/RepresentationController.js
index 0c1e9b92f6..073d9a6686 100644
--- a/src/dash/controllers/RepresentationController.js
+++ b/src/dash/controllers/RepresentationController.js
@@ -62,8 +62,7 @@ function RepresentationController(config) {
     }
 
     function checkConfig() {
-        if (!abrController || !dashMetrics || !playbackController ||
-            !timelineConverter) {
+        if (!abrController || !dashMetrics || !playbackController || !timelineConverter) {
             throw new Error(Constants.MISSING_CONFIG_ERROR);
         }
     }
@@ -178,7 +177,10 @@ function RepresentationController(config) {
         for (let i = 0, ln = voAvailableRepresentations.length; i < ln; i++) {
             updateRepresentation(voAvailableRepresentations[i], isDynamic);
             if (notifyUpdate) {
-                eventBus.trigger(events.REPRESENTATION_UPDATE_STARTED, { sender: instance, representation:  voAvailableRepresentations[i]});
+                eventBus.trigger(events.REPRESENTATION_UPDATE_STARTED, {
+                    sender: instance,
+                    representation: voAvailableRepresentations[i]
+                });
             }
         }
     }
@@ -191,7 +193,7 @@ function RepresentationController(config) {
 
     function startDataUpdate() {
         updating = true;
-        eventBus.trigger(events.DATA_UPDATE_STARTED, { sender: instance });
+        eventBus.trigger(events.DATA_UPDATE_STARTED, {sender: instance});
     }
 
     function endDataUpdate(error) {
@@ -216,7 +218,7 @@ function RepresentationController(config) {
 
             updateAvailabilityWindow(playbackController.getIsDynamic(), true);
         };
-        eventBus.trigger(events.AST_IN_FUTURE, { delay: delay });
+        eventBus.trigger(events.AST_IN_FUTURE, {delay: delay});
         setTimeout(update, delay);
     }
 
@@ -237,12 +239,9 @@ function RepresentationController(config) {
             err,
             repSwitch;
 
-        if (r.adaptation.period.mpd.manifest.type === dashConstants.DYNAMIC && !r.adaptation.period.mpd.manifest.ignorePostponeTimePeriod)
-        {
-            let segmentAvailabilityTimePeriod = r.segmentAvailabilityRange.end - r.segmentAvailabilityRange.start;
+        if (r.adaptation.period.mpd.manifest.type === dashConstants.DYNAMIC && !r.adaptation.period.mpd.manifest.ignorePostponeTimePeriod) {
             // We must put things to sleep unless till e.g. the startTime calculation in ScheduleController.onLiveEdgeSearchCompleted fall after the segmentAvailabilityRange.start
-            let liveDelay = playbackController.computeLiveDelay(currentVoRepresentation.segmentDuration, streamInfo.manifestInfo.DVRWindowSize);
-            postponeTimePeriod = (liveDelay - segmentAvailabilityTimePeriod) * 1000;
+            postponeTimePeriod = getRepresentationUpdatePostponeTimePeriod(r, streamInfo);
         }
 
         if (postponeTimePeriod > 0) {
@@ -279,6 +278,26 @@ function RepresentationController(config) {
         }
     }
 
+    function getRepresentationUpdatePostponeTimePeriod(representation, streamInfo) {
+        try {
+            const streamController = playbackController.getStreamController();
+            const activeStreamInfo = streamController.getActiveStreamInfo();
+            let startTimeAnchor = representation.segmentAvailabilityRange.start;
+
+            if (activeStreamInfo && activeStreamInfo.id && activeStreamInfo.id !== streamInfo.id) {
+                // We need to consider the currently playing period if a period switch is performed.
+                startTimeAnchor = Math.min(playbackController.getTime(), startTimeAnchor);
+            }
+
+            let segmentAvailabilityTimePeriod = representation.segmentAvailabilityRange.end - startTimeAnchor;
+            let liveDelay = playbackController.getLiveDelay();
+
+            return (liveDelay - segmentAvailabilityTimePeriod) * 1000;
+        } catch (e) {
+            return 0;
+        }
+    }
+
     function onWallclockTimeUpdated(e) {
         if (e.isDynamic) {
             updateAvailabilityWindow(e.isDynamic);
diff --git a/src/dash/models/DashManifestModel.js b/src/dash/models/DashManifestModel.js
index e67c4252e4..156b871c56 100644
--- a/src/dash/models/DashManifestModel.js
+++ b/src/dash/models/DashManifestModel.js
@@ -277,6 +277,11 @@ function DashManifestModel() {
             }
         }
 
+        // If the codec contains a profiles parameter we remove it. Otherwise it will cause problems when checking for codec capabilities of the platform
+        if (codec) {
+            codec = codec.replace(/\sprofiles=[^;]*/g, '');
+        }
+
         return codec;
     }
 
@@ -537,6 +542,12 @@ function DashManifestModel() {
                         // SegmentTemplate @duration attribute. We need to find out if @maxSegmentDuration should be used instead of calculated duration if the the duration
                         // exceeds @maxSegmentDuration
                         voRepresentation.segmentDuration = segmentInfo.duration / voRepresentation.timescale;
+                    } else if (realRepresentation.hasOwnProperty(DashConstants.SEGMENT_TEMPLATE)) {
+                        segmentInfo = realRepresentation.SegmentTemplate;
+
+                        if (segmentInfo.hasOwnProperty(DashConstants.SEGMENT_TIMELINE)) {
+                            voRepresentation.segmentDuration = calcSegmentDuration(segmentInfo.SegmentTimeline) / voRepresentation.timescale;
+                        }
                     }
                     if (segmentInfo.hasOwnProperty(DashConstants.MEDIA)) {
                         voRepresentation.media = segmentInfo.media;
@@ -571,6 +582,12 @@ function DashManifestModel() {
         return voRepresentations;
     }
 
+    function calcSegmentDuration(segmentTimeline) {
+        let s0 = segmentTimeline.S_asArray[0];
+        let s1 = segmentTimeline.S_asArray[1];
+        return s0.hasOwnProperty('d') ? s0.d : (s1.t - s0.t);
+    }
+
     function calcMSETimeOffset(representation) {
         // The MSEOffset is offset from AST for media. It is Period@start - presentationTimeOffset
         const presentationOffset = representation.presentationTimeOffset;
diff --git a/src/dash/parser/DashParser.js b/src/dash/parser/DashParser.js
index 7b8497e436..df41063c7f 100644
--- a/src/dash/parser/DashParser.js
+++ b/src/dash/parser/DashParser.js
@@ -29,7 +29,6 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 import FactoryMaker from '../../core/FactoryMaker';
-import Debug from '../../core/Debug';
 import ObjectIron from './objectiron';
 import X2JS from '../../../externals/xml2json';
 import StringMatcher from './matchers/StringMatcher';
@@ -39,9 +38,11 @@ import NumericMatcher from './matchers/NumericMatcher';
 import RepresentationBaseValuesMap from './maps/RepresentationBaseValuesMap';
 import SegmentValuesMap from './maps/SegmentValuesMap';
 
-function DashParser() {
+function DashParser(config) {
 
+    config = config || {};
     const context = this.context;
+    const debug = config.debug;
 
     let instance,
         logger,
@@ -50,7 +51,7 @@ function DashParser() {
         objectIron;
 
     function setup() {
-        logger = Debug(context).getInstance().getLogger(instance);
+        logger = debug.getLogger(instance);
         matchers = [
             new DurationMatcher(),
             new DateTimeMatcher(),
@@ -99,6 +100,8 @@ function DashParser() {
         const ironedTime = window.performance.now();
         logger.info('Parsing complete: ( xml2json: ' + (jsonTime - startTime).toPrecision(3) + 'ms, objectiron: ' + (ironedTime - jsonTime).toPrecision(3) + 'ms, total: ' + ((ironedTime - startTime) / 1000).toPrecision(3) + 's)');
 
+        manifest.protocol = 'DASH';
+
         return manifest;
     }
 
diff --git a/src/dash/utils/TimelineConverter.js b/src/dash/utils/TimelineConverter.js
index 8b554c8970..5d8a2c0ac8 100644
--- a/src/dash/utils/TimelineConverter.js
+++ b/src/dash/utils/TimelineConverter.js
@@ -31,17 +31,25 @@
 import EventBus from '../../core/EventBus';
 import Events from '../../core/events/Events';
 import FactoryMaker from '../../core/FactoryMaker';
+import DashConstants from '../constants/DashConstants';
+import DashManifestModel from '../models/DashManifestModel';
 
 function TimelineConverter() {
 
-    let context = this.context;
-    let eventBus = EventBus(context).getInstance();
+    const context = this.context;
+    const eventBus = EventBus(context).getInstance();
 
     let instance,
+        dashManifestModel,
         clientServerTimeShift,
         isClientServerTimeSyncCompleted,
         expectedLiveEdge;
 
+    function setup() {
+        dashManifestModel = DashManifestModel(context).getInstance();
+        reset();
+    }
+
     function initialize() {
         resetInitialSettings();
         eventBus.on(Events.TIME_SYNCHRONIZATION_COMPLETED, onTimeSyncComplete, this);
@@ -147,6 +155,12 @@ function TimelineConverter() {
 
         // Dynamic Range Finder
         const d = voRepresentation.segmentDuration || (voRepresentation.segments && voRepresentation.segments.length ? voRepresentation.segments[voRepresentation.segments.length - 1].duration : 0);
+
+        // Specific use case of SegmentTimeline without timeShiftBufferDepth
+        if (voRepresentation.segmentInfoType === DashConstants.SEGMENT_TIMELINE && voPeriod.mpd.timeShiftBufferDepth === Number.POSITIVE_INFINITY) {
+            return calcSegmentAvailabilityRangeFromTimeline(voRepresentation);
+        }
+
         const now = calcPresentationTimeFromWallTime(new Date(), voPeriod);
         const periodEnd = voPeriod.start + voPeriod.duration;
         range.start = Math.max((now - voPeriod.mpd.timeShiftBufferDepth), voPeriod.start);
@@ -159,6 +173,36 @@ function TimelineConverter() {
         return range;
     }
 
+    function calcSegmentAvailabilityRangeFromTimeline(voRepresentation) {
+        const adaptation = voRepresentation.adaptation.period.mpd.manifest.Period_asArray[voRepresentation.adaptation.period.index].AdaptationSet_asArray[voRepresentation.adaptation.index];
+        const representation = dashManifestModel.getRepresentationFor(voRepresentation.index, adaptation);
+
+        const timeline = representation.SegmentTemplate.SegmentTimeline;
+        const timescale = representation.SegmentTemplate.timescale;
+        const segments = timeline.S_asArray;
+        const range = { start: 0, end: 0 };
+        let d = 0;
+        let segment,
+            repeat,
+            i,
+            len;
+
+        range.start = segments[0].t / timescale;
+
+        for (i = 0, len = segments.length; i < len; i++) {
+            segment = segments[i];
+            repeat = 0;
+            if (segment.hasOwnProperty('r')) {
+                repeat = segment.r;
+            }
+            d += (segment.d / timescale)  * (1 + repeat);
+        }
+
+        range.end = range.start + d;
+
+        return range;
+    }
+
     function getPeriodEnd(voRepresentation, isDynamic) {
         // Static Range Finder
         const voPeriod = voRepresentation.adaptation.period;
@@ -232,8 +276,9 @@ function TimelineConverter() {
         reset: reset
     };
 
+    setup();
     return instance;
 }
 
 TimelineConverter.__dashjs_factory_name = 'TimelineConverter';
-export default FactoryMaker.getSingletonFactory(TimelineConverter);
\ No newline at end of file
+export default FactoryMaker.getSingletonFactory(TimelineConverter);
diff --git a/src/mss/MssFragmentMoovProcessor.js b/src/mss/MssFragmentMoovProcessor.js
index f4ac6a88d5..130f18f3bb 100644
--- a/src/mss/MssFragmentMoovProcessor.js
+++ b/src/mss/MssFragmentMoovProcessor.js
@@ -154,7 +154,7 @@ function MssFragmentMoovProcessor(config) {
         mvhd.creation_time = 0; // the creation time of the presentation => ignore (set to 0)
         mvhd.modification_time = 0; // the most recent time the presentation was modified => ignore (set to 0)
         mvhd.timescale = timescale; // the time-scale for the entire presentation => 10000000 for MSS
-        mvhd.duration = Math.round(period.duration * timescale); // the length of the presentation (in the indicated timescale) =>  take duration of period
+        mvhd.duration = period.duration === Infinity ? 0xFFFFFFFFFFFFFFFF : Math.round(period.duration * timescale); // the length of the presentation (in the indicated timescale) =>  take duration of period
         mvhd.rate = 1.0; // 16.16 number, '1.0' = normal playback
         mvhd.volume = 1.0; // 8.8 number, '1.0' = full volume
         mvhd.reserved1 = 0;
@@ -183,7 +183,7 @@ function MssFragmentMoovProcessor(config) {
         tkhd.modification_time = 0; // the most recent time the presentation was modified => ignore (set to 0)
         tkhd.track_ID = trackId; // uniquely identifies this track over the entire life-time of this presentation
         tkhd.reserved1 = 0;
-        tkhd.duration = Math.round(period.duration * timescale); // the duration of this track (in the timescale indicated in the Movie Header Box) =>  take duration of period
+        tkhd.duration = period.duration === Infinity ? 0xFFFFFFFFFFFFFFFF : Math.round(period.duration * timescale); // the duration of this track (in the timescale indicated in the Movie Header Box) =>  take duration of period
         tkhd.reserved2 = [0x0, 0x0];
         tkhd.layer = 0; // specifies the front-to-back ordering of video tracks; tracks with lower numbers are closer to the viewer => 0 since only one video track
         tkhd.alternate_group = 0; // specifies a group or collection of tracks => ignore
@@ -209,8 +209,8 @@ function MssFragmentMoovProcessor(config) {
         mdhd.creation_time = 0; // the creation time of the presentation => ignore (set to 0)
         mdhd.modification_time = 0; // the most recent time the presentation was modified => ignore (set to 0)
         mdhd.timescale = timescale; // the time-scale for the entire presentation
-        mdhd.duration = Math.round(period.duration * timescale); // the duration of this media (in the scale of the timescale). If the duration cannot be determined then duration is set to all 1s.
-        mdhd.language = adaptationSet.lang || 'und'; // declares the language code for this media (see getLanguageCode())
+        mdhd.duration = period.duration === Infinity ? 0xFFFFFFFFFFFFFFFF : Math.round(period.duration * timescale); // the duration of this media (in the scale of the timescale). If the duration cannot be determined then duration is set to all 1s.
+        mdhd.language = adaptationSet.lang || 'und'; // declares the language code for this media
         mdhd.pre_defined = 0;
 
         return mdhd;
diff --git a/src/mss/MssHandler.js b/src/mss/MssHandler.js
index 6745d5b95f..dd13804ff4 100644
--- a/src/mss/MssHandler.js
+++ b/src/mss/MssHandler.js
@@ -36,20 +36,21 @@ import MssFragmentProcessor from './MssFragmentProcessor';
 import MssParser from './parser/MssParser';
 import MssErrors from './errors/MssErrors';
 import DashJSError from '../streaming/vo/DashJSError';
+import InitCache from '../streaming/utils/InitCache';
 
 function MssHandler(config) {
 
     config = config || {};
-    let context = this.context;
-    let eventBus = config.eventBus;
+    const context = this.context;
+    const eventBus = config.eventBus;
     const events = config.events;
     const constants = config.constants;
     const initSegmentType = config.initSegmentType;
-    let dashMetrics = config.dashMetrics;
-    let playbackController = config.playbackController;
-    let streamController = config.streamController;
-    let protectionController = config.protectionController;
-    let mssFragmentProcessor = MssFragmentProcessor(context).create({
+    const dashMetrics = config.dashMetrics;
+    const playbackController = config.playbackController;
+    const streamController = config.streamController;
+    const protectionController = config.protectionController;
+    const mssFragmentProcessor = MssFragmentProcessor(context).create({
         dashMetrics: dashMetrics,
         playbackController: playbackController,
         protectionController: protectionController,
@@ -62,10 +63,12 @@ function MssHandler(config) {
     });
     let mssParser,
         fragmentInfoControllers,
+        initCache,
         instance;
 
     function setup() {
         fragmentInfoControllers = [];
+        initCache = InitCache(context).getInstance();
     }
 
     function getStreamProcessor(type) {
@@ -128,8 +131,8 @@ function MssHandler(config) {
         fragmentInfoControllers = [];
     }
 
-    function onInitializationRequested(e) {
-        let streamProcessor = getStreamProcessor(e.mediaType);
+    function onInitFragmentNeeded(e) {
+        let streamProcessor = getStreamProcessor(e.sender.getType());
         if (!streamProcessor) return;
 
         // Create init segment request
@@ -208,7 +211,7 @@ function MssHandler(config) {
     }
 
     function registerEvents() {
-        eventBus.on(events.INIT_REQUESTED, onInitializationRequested, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
+        eventBus.on(events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
         eventBus.on(events.PLAYBACK_PAUSED, onPlaybackPaused, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
         eventBus.on(events.PLAYBACK_SEEK_ASKED, onPlaybackSeekAsked, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
         eventBus.on(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
@@ -216,7 +219,12 @@ function MssHandler(config) {
     }
 
     function reset() {
-        eventBus.off(events.INIT_REQUESTED, onInitializationRequested, this);
+        if (mssParser) {
+            mssParser.reset();
+            mssParser = undefined;
+        }
+
+        eventBus.off(events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, this);
         eventBus.off(events.PLAYBACK_PAUSED, onPlaybackPaused, this);
         eventBus.off(events.PLAYBACK_SEEK_ASKED, onPlaybackSeekAsked, this);
         eventBus.off(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, this);
diff --git a/src/mss/parser/MssParser.js b/src/mss/parser/MssParser.js
index a03891fdbc..80ece236a3 100644
--- a/src/mss/parser/MssParser.js
+++ b/src/mss/parser/MssParser.js
@@ -79,7 +79,8 @@ function MssParser(config) {
     };
 
     let instance,
-        logger;
+        logger,
+        initialBufferSettings;
 
 
     function setup() {
@@ -687,8 +688,8 @@ function MssParser(config) {
             if (adaptations[i].contentType === 'video') {
                 // Get video segment duration
                 segmentDuration = adaptations[i].SegmentTemplate.SegmentTimeline.S_asArray[0].d / adaptations[i].SegmentTemplate.timescale;
-                // Set minBufferTime
-                manifest.minBufferTime = segmentDuration * 2;
+                // Set minBufferTime to one segment duration
+                manifest.minBufferTime = segmentDuration;
 
                 if (manifest.type === 'dynamic' ) {
                     // Set availabilityStartTime
@@ -722,6 +723,17 @@ function MssParser(config) {
             let liveDelay = Math.min(targetDelayCapping, targetLiveDelay);
             // Consider a margin of one segment in order to avoid Precondition Failed errors (412), for example if audio and video are not correctly synchronized
             let bufferTime = liveDelay - segmentDuration;
+
+            // Store initial buffer settings
+            initialBufferSettings = {
+                'streaming': {
+                    'liveDelay': settings.get().streaming.liveDelay,
+                    'stableBufferTime': settings.get().streaming.stableBufferTime,
+                    'bufferTimeAtTopQuality': settings.get().streaming.bufferTimeAtTopQuality,
+                    'bufferTimeAtTopQualityLongForm': settings.get().streaming.bufferTimeAtTopQualityLongForm
+                }
+            };
+
             settings.update({
                 'streaming': {
                     'liveDelay': liveDelay,
@@ -836,10 +848,18 @@ function MssParser(config) {
         return manifest;
     }
 
+    function reset() {
+        // Restore initial buffer settings
+        if (initialBufferSettings) {
+            settings.update(initialBufferSettings);
+        }
+    }
+
     instance = {
         parse: internalParse,
         getMatchers: getMatchers,
-        getIron: getIron
+        getIron: getIron,
+        reset: reset
     };
 
     setup();
diff --git a/src/offline/OfflineDownload.js b/src/offline/OfflineDownload.js
index 0fb4476175..495460cf02 100644
--- a/src/offline/OfflineDownload.js
+++ b/src/offline/OfflineDownload.js
@@ -32,20 +32,26 @@ import OfflineConstants from './constants/OfflineConstants';
 import OfflineStream from './OfflineStream';
 import OfflineIndexDBManifestParser from './utils/OfflineIndexDBManifestParser';
 import OfflineErrors from './errors/OfflineErrors';
+import DashParser from '../dash/parser/DashParser';
 
-/**
- * @class OfflineDownload
- */
 function OfflineDownload(config) {
     config = config || {};
 
+    const context = this.context;
     const manifestLoader = config.manifestLoader;
+    const mediaPlayerModel = config.mediaPlayerModel;
+    const abrController = config.abrController;
+    const playbackController = config.playbackController;
     const adapter = config.adapter;
+    const dashMetrics = config.dashMetrics;
+    const timelineConverter = config.timelineConverter;
     const offlineStoreController = config.offlineStoreController;
     const manifestId = config.id;
     const eventBus = config.eventBus;
     const errHandler = config.errHandler;
     const events = config.events;
+    const errors = config.errors;
+    const settings = config.settings;
     const debug = config.debug;
     const manifestUpdater = config.manifestUpdater;
     const baseURLController = config.baseURLController;
@@ -53,8 +59,6 @@ function OfflineDownload(config) {
     const dashConstants = config.dashConstants;
     const urlUtils = config.urlUtils;
 
-    const context = this.context;
-
     let instance,
         logger,
         _manifestURL,
@@ -172,7 +176,7 @@ function OfflineDownload(config) {
         if (!e.error && manifestId !== null) {
             _status = OfflineConstants.OFFLINE_STATUS_STARTED;
             offlineStoreController.setDownloadingStatus(manifestId, _status).then(function () {
-                eventBus.trigger(events.DOWNLOADING_STARTED, {id: manifestId, message: 'Downloading started for this stream !'});
+                eventBus.trigger(events.OFFLINE_RECORD_STARTED, {id: manifestId, message: 'Downloading started for this stream !'});
             });
         } else {
             _status = OfflineConstants.OFFLINE_STATUS_ERROR;
@@ -230,7 +234,7 @@ function OfflineDownload(config) {
             _status = OfflineConstants.OFFLINE_STATUS_FINISHED;
             offlineStoreController.setDownloadingStatus(manifestId, _status)
             .then(function () {
-                eventBus.trigger(events.DOWNLOADING_FINISHED, {id: manifestId, message: 'Downloading has been successfully completed for this stream !'});
+                eventBus.trigger(events.OFFLINE_RECORD_FINISHED, {id: manifestId, message: 'Downloading has been successfully completed for this stream !'});
                 resetDownload();
             });
         } else {
@@ -303,9 +307,19 @@ function OfflineDownload(config) {
                         updateManifestNeeded: onManifestUpdateNeeded
                     },
                     constants: constants,
+                    dashConstants: dashConstants,
                     eventBus: eventBus,
                     events: events,
+                    errors: errors,
+                    settings: settings,
                     debug: debug,
+                    errHandler: errHandler,
+                    mediaPlayerModel: mediaPlayerModel,
+                    abrController: abrController,
+                    playbackController: playbackController,
+                    dashMetrics: dashMetrics,
+                    baseURLController: baseURLController,
+                    timelineConverter: timelineConverter,
                     adapter: adapter,
                     offlineStoreController: offlineStoreController
                 });
@@ -331,9 +345,9 @@ function OfflineDownload(config) {
         }
     }
 
-    function getDownloadableRepresentations() {
+    function getMediaInfos() {
         _streams.forEach(stream => {
-            stream.getDownloadableRepresentations();
+            stream.getMediaInfos();
         });
     }
 
@@ -409,8 +423,8 @@ function OfflineDownload(config) {
         // initialise offline streams
         composeStreams(_manifest);
 
-        // get downloadable representations
-        getDownloadableRepresentations();
+        // get MediaInfos
+        getMediaInfos();
 
         eventBus.trigger(events.STREAMS_COMPOSED);
     }
@@ -421,37 +435,41 @@ function OfflineDownload(config) {
         }
     }
 
-    function formatSelectedRepresentations(selectedRepresentations) {
-        let ret = {
-        };
-
-        ret[constants.VIDEO] = [];
-        ret[constants.AUDIO] = [];
-        ret[constants.TEXT] = [];
-        ret[constants.FRAGMENTED_TEXT] = [];
-        selectedRepresentations.video.forEach(item => {
-            ret[constants.VIDEO].push(item.id);
-        });
-        selectedRepresentations.audio.forEach(item => {
-            ret[constants.AUDIO].push(item.id);
-        });
-        selectedRepresentations.text.forEach(item => {
-            ret[item.type].push(item.id);
+    function getSelectedRepresentations(mediaInfos) {
+        let rep = {};
+        rep[constants.VIDEO] = [];
+        rep[constants.AUDIO] = [];
+        rep[constants.TEXT] = [];
+        rep[constants.FRAGMENTED_TEXT] = [];
+
+        // selectedRepresentations.video.forEach(item => {
+        //     ret[constants.VIDEO].push(item.id);
+        // });
+        // selectedRepresentations.audio.forEach(item => {
+        //     ret[constants.AUDIO].push(item.id);
+        // });
+        // selectedRepresentations.text.forEach(item => {
+        //     ret[item.type].push(item.id);
+        // });
+
+        mediaInfos.forEach(mediaInfo => {
+            mediaInfo.bitrateList.forEach(bitrate => {
+                rep[mediaInfo.type].push(bitrate.id);
+            });
         });
-
-        return ret;
+        return rep;
     }
 
-    function startDownload(selectedRepresentations) {
+    function startDownload(mediaInfos) {
         try {
-            let rep = formatSelectedRepresentations(selectedRepresentations);
+            let rep = getSelectedRepresentations(mediaInfos);
 
             offlineStoreController.saveSelectedRepresentations(manifestId, rep)
             .then(() => {
                 return createFragmentStore(manifestId);
             })
             .then(() => {
-                return generateOfflineManifest(_xmlManifest, rep, manifestId);
+                return generateOfflineManifest(rep);
             })
             .then(function () {
                 initializeAllMediasInfoList(rep);
@@ -472,12 +490,10 @@ function OfflineDownload(config) {
     /**
      * Create the parser used to convert original manifest in offline manifest
      * Creates a JSON object that will be stored in database
-     * @param {string} XMLManifest
      * @param {Object[]} selectedRepresentations
-     * @param {number} manifestId
      * @instance
      */
-    function generateOfflineManifest(XMLManifest, selectedRepresentations, manifestId) {
+    function generateOfflineManifest(selectedRepresentations) {
         _indexDBManifestParser = OfflineIndexDBManifestParser(context).create({
             manifestId: manifestId,
             allMediaInfos: selectedRepresentations,
@@ -487,12 +503,12 @@ function OfflineDownload(config) {
             urlUtils: urlUtils
         });
 
-        return _indexDBManifestParser.parse(XMLManifest).then(function (parsedManifest) {
-            if (parsedManifest !== null && manifestId !== null) {
+        return _indexDBManifestParser.parse(_xmlManifest).then(function (parsedManifest) {
+            if (parsedManifest !== null) {
                 return offlineStoreController.getManifestById(manifestId)
                 .then((item) => {
                     item.originalURL = _manifest.url;
-                    item.originalManifest = _manifest;
+                    item.originalManifest = _xmlManifest;
                     item.manifest = parsedManifest;
                     return updateOfflineManifest(item);
                 });
@@ -522,7 +538,7 @@ function OfflineDownload(config) {
             _status = OfflineConstants.OFFLINE_STATUS_STOPPED;
             // update status
             offlineStoreController.setDownloadingStatus(manifestId, _status).then(function () {
-                eventBus.trigger(events.DOWNLOADING_STOPPED, {
+                eventBus.trigger(events.OFFLINE_RECORD_STOPPED, {
                     sender: this,
                     id: manifestId,
                     status: _status,
@@ -546,24 +562,29 @@ function OfflineDownload(config) {
      * @instance
      */
     function resumeDownload() {
-        if (!isDownloading()) {
-            _isDownloadingStatus = true;
+        if (isDownloading()) {
+            return;
+        }
 
-            let selectedRepresentation;
+        _isDownloadingStatus = true;
 
-            offlineStoreController.getManifestById(manifestId)
-            .then((item) => {
-                _manifest = item.originalManifest;
-                selectedRepresentation = item.selected;
+        let selectedRepresentations;
 
-                composeStreams(_manifest);
-                eventBus.trigger(events.STREAMS_COMPOSED);
+        offlineStoreController.getManifestById(manifestId)
+        .then((item) => {
+            let parser = DashParser(context).create({debug: debug});
+            _manifest = parser.parse(item.originalManifest);
 
-                return createFragmentStore(manifestId);
-            }). then(() => {
-                initializeAllMediasInfoList(selectedRepresentation);
-            });
-        }
+            composeStreams(_manifest);
+
+            selectedRepresentations = item.selected;
+
+            eventBus.trigger(events.STREAMS_COMPOSED);
+
+            return createFragmentStore(manifestId);
+        }). then(() => {
+            initializeAllMediasInfoList(selectedRepresentations);
+        });
     }
 
     /**
diff --git a/src/offline/OfflineStream.js b/src/offline/OfflineStream.js
index 13e4d0f626..aca086c553 100644
--- a/src/offline/OfflineStream.js
+++ b/src/offline/OfflineStream.js
@@ -31,9 +31,13 @@
 import OfflineStreamProcessor from './OfflineStreamProcessor';
 
 /**
- * @module  OfflineStream
+ * Initialize and Manage Offline Stream for each type
+ */
+/**
+ * @class OfflineStream
  * @description Initialize and Manage Offline Stream for each type
  * @param {Object} config - dependences
+ * @ignore
  */
 function OfflineStream(config) {
 
@@ -41,9 +45,19 @@ function OfflineStream(config) {
     const context = this.context;
     const eventBus = config.eventBus;
     const events = config.events;
+    const errors = config.errors;
     const constants = config.constants;
+    const dashConstants = config.dashConstants;
+    const settings = config.settings;
     const debug = config.debug;
+    const errHandler = config.errHandler;
+    const mediaPlayerModel = config.mediaPlayerModel;
+    const abrController = config.abrController;
+    const playbackController = config.playbackController;
     const adapter = config.adapter;
+    const dashMetrics = config.dashMetrics;
+    const baseURLController = config.baseURLController;
+    const timelineConverter = config.timelineConverter;
     const offlineStoreController = config.offlineStoreController;
     const manifestId = config.id;
     const startedCb = config.callbacks && config.callbacks.started;
@@ -87,98 +101,23 @@ function OfflineStream(config) {
     }
 
     /**
-     * Creates media bitrate list, so that user will be able to choose the representation he wants to download
+     * Creates media infos list, so that user will be able to choose the representation he wants to download
      */
-    function getDownloadableRepresentations() {
-        let downloadableRepresentations = {
-            video: [],
-            audio: [],
-            text: []
-        };
-
-        const trackKindMap = { subtitle: 'subtitles', caption: 'captions' }; //Dash Spec has no "s" on end of KIND but HTML needs plural.
-        const getKind = function (mediaInfo) {
-            let kind = (mediaInfo.roles.length > 0) ? trackKindMap[mediaInfo.roles[0]] : trackKindMap.caption;
-            kind = (kind === trackKindMap.caption || kind === trackKindMap.subtitle) ? kind : trackKindMap.caption;
-            return kind;
-        };
-
-        // video
-        let mediaInfo = adapter.getAllMediaInfoForType(streamInfo, constants.VIDEO);
-        if (mediaInfo.length > 0) {
-            mediaInfo.forEach((item) => {
-                item.bitrateList.forEach((bitrate) => {
-                    downloadableRepresentations.video.push({
-                        id: bitrate.id,
-                        bandwidth: bitrate.bandwidth,
-                        width: bitrate.width,
-                        height: bitrate.height
-                    });
-                });
-            });
-        }
-
-        // audio
-        mediaInfo = adapter.getAllMediaInfoForType(streamInfo, constants.AUDIO);
-        if (mediaInfo.length > 0) {
-            mediaInfo.forEach((item) => {
-                item.bitrateList.forEach((bitrate) => {
-                    downloadableRepresentations.audio.push({
-                        id: bitrate.id,
-                        bandwidth: bitrate.bandwidth,
-                        lang: item.lang
-                    });
-                });
-            });
-        }
-
-        // text
-
-        const addTextInfo = function (infos, type) {
-            if (infos.length > 0) {
-
-                infos.forEach((item) => {
-                    item.bitrateList.forEach((bitrate) => {
-                        downloadableRepresentations.text.push({
-                            id: bitrate.id,
-                            lang: item.lang,
-                            kind: getKind(item),
-                            roles: item.roles,
-                            accessibility: item.accessibility,
-                            type: type
-                        });
-                    });
-                });
-            }
-        };
-
-        mediaInfo = adapter.getAllMediaInfoForType(streamInfo, constants.FRAGMENTED_TEXT);
-        addTextInfo(mediaInfo, constants.FRAGMENTED_TEXT);
+    function getMediaInfos() {
+        let mediaInfos = adapter.getAllMediaInfoForType(streamInfo, constants.VIDEO);
+        mediaInfos = mediaInfos.concat(adapter.getAllMediaInfoForType(streamInfo, constants.AUDIO));
+        mediaInfos = mediaInfos.concat(adapter.getAllMediaInfoForType(streamInfo, constants.FRAGMENTED_TEXT));
+        mediaInfos = mediaInfos.concat(adapter.getAllMediaInfoForType(streamInfo, constants.TEXT));
 
-        mediaInfo = adapter.getAllMediaInfoForType(streamInfo, constants.TEXT);
-        addTextInfo(mediaInfo, constants.TEXT);
+        // mediaInfos = mediaInfos.concat(adapter.getAllMediaInfoForType(streamInfo, constants.MUXED));
+        // mediaInfos = mediaInfos.concat(adapter.getAllMediaInfoForType(streamInfo, constants.IMAGE));
 
-        /**
-        mediaInfo = adapter.getAllMediaInfoForType(streamInfo, constants.MUXED);
-        if (mediaInfo.length > 0) {
-            downloadableRepresentations.push(mediaInfo);
-        }
-        mediaInfo = adapter.getAllMediaInfoForType(streamInfo, constants.IMAGE);
-        if (mediaInfo.length > 0) {
-            downloadableRepresentations.push(mediaInfo);
-        }
-        */
-
-        eventBus.trigger(events.DOWNLOADABLE_REPRESENTATIONS_LOADED, {
-            data: {
-                id: manifestId,
-                downloadableRepresentations: downloadableRepresentations
-            },
-            sender: this
+        eventBus.trigger(events.OFFLINE_RECORD_LOADEDMETADATA, {
+            id: manifestId,
+            mediaInfos: mediaInfos
         });
     }
 
-
     /**
      * Initialize with choosen representations by user
      * @param {Object} mediasInfoList
@@ -198,13 +137,8 @@ function OfflineStream(config) {
         createOfflineStreamProcessorFor(constants.FRAGMENTED_TEXT,streamInfo);
         createOfflineStreamProcessorFor(constants.TEXT,streamInfo);
 
-        for (let i = 0; i < offlineStreamProcessors.length; i++) {
-            offlineStreamProcessors[i].initialize();
-        }
-        /*
         createOfflineStreamProcessorFor(constants.MUXED,streamInfo);
         createOfflineStreamProcessorFor(constants.IMAGE,streamInfo);
-        */
     }
 
     function createOfflineStreamProcessorFor(type, streamInfo) {
@@ -238,25 +172,33 @@ function OfflineStream(config) {
 
         let streamProcessor = OfflineStreamProcessor(context).create({
             id: manifestId,
-            callbacks: {
-                completed: onStreamCompleted,
-                progression: onStreamProgression
-            },
+            streamInfo: streamInfo,
             debug: debug,
             events: events,
+            errors: errors,
             eventBus: eventBus,
-            constants: constants
-        });
-        streamProcessor.setConfig({
+            constants: constants,
+            dashConstants: dashConstants,
+            settings: settings,
             type: mediaInfo.type,
             mimeType: mediaInfo.mimeType,
-            mediaInfo: mediaInfo,
             bitrate: bitrate,
+            errHandler: errHandler,
+            mediaPlayerModel: mediaPlayerModel,
+            abrController: abrController,
+            playbackController: playbackController,
             adapter: adapter,
-            stream: instance,
-            offlineStoreController: offlineStoreController
+            dashMetrics: dashMetrics,
+            baseURLController: baseURLController,
+            timelineConverter: timelineConverter,
+            offlineStoreController: offlineStoreController,
+            callbacks: {
+                completed: onStreamCompleted,
+                progression: onStreamProgression
+            }
         });
         offlineStreamProcessors.push(streamProcessor);
+        streamProcessor.initialize(mediaInfo);
 
         progressionById[bitrate.id] = null;
     }
@@ -307,7 +249,7 @@ function OfflineStream(config) {
         let sp;
         // data are ready fr stream processor, let's start download
         for (let i = 0; i < offlineStreamProcessors.length; i++ ) {
-            if (offlineStreamProcessors[i].getRepresentationController() === repCtrl) {
+            if (offlineStreamProcessors[i].getRepresentationController().getType() === repCtrl.getType()) {
                 sp = offlineStreamProcessors[i];
                 break;
             }
@@ -382,7 +324,7 @@ function OfflineStream(config) {
 
     instance = {
         initialize: initialize,
-        getDownloadableRepresentations: getDownloadableRepresentations,
+        getMediaInfos: getMediaInfos,
         initializeAllMediasInfoList: initializeAllMediasInfoList,
         getStreamInfo: getStreamInfo,
         stopOfflineStreamProcessors: stopOfflineStreamProcessors,
diff --git a/src/offline/OfflineStreamProcessor.js b/src/offline/OfflineStreamProcessor.js
index 9126766447..e41e31cabd 100644
--- a/src/offline/OfflineStreamProcessor.js
+++ b/src/offline/OfflineStreamProcessor.js
@@ -28,81 +28,119 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-import OfflineEvents from './events/OfflineEvents';
+import DashHandler from '../dash/DashHandler';
+import RepresentationController from '../dash/controllers/RepresentationController';
+import FragmentModel from '../streaming/models/FragmentModel';
+import FragmentLoader from '../streaming/FragmentLoader';
+import URLUtils from '../streaming/utils/URLUtils';
+import RequestModifier from '../streaming/utils/RequestModifier';
+
 
-/**
- * @module OfflineStreamProcessor
- * @param {object} config configuration
- * @description Arrange downloading for each type
- */
 function OfflineStreamProcessor(config) {
 
     config = config || {};
+    const context = this.context;
     const eventBus = config.eventBus;
     const events = config.events;
+    const errors = config.errors;
     const debug = config.debug;
     const constants = config.constants;
+    const settings = config.settings;
+    const dashConstants = config.dashConstants;
     const manifestId = config.id;
+    const type = config.type;
+    const streamInfo = config.streamInfo;
+    const errHandler = config.errHandler;
+    const mediaPlayerModel = config.mediaPlayerModel;
+    const abrController = config.abrController;
+    const playbackController = config.playbackController;
+    const adapter = config.adapter;
+    const dashMetrics = config.dashMetrics;
+    const baseURLController = config.baseURLController;
+    const timelineConverter = config.timelineConverter;
+    const bitrate = config.bitrate;
+    const offlineStoreController = config.offlineStoreController;
     const completedCb = config.callbacks && config.callbacks.completed;
     const progressCb = config.callbacks && config.callbacks.progression;
 
     let instance,
-        adapter,
         logger,
+        mediaInfo,
         indexHandler,
         representationController,
-        type,
-        mimeType,
         fragmentModel,
-        mediaInfo,
-        bitrate,
         updating,
-        offlineStoreController,
         downloadedSegments,
         isInitialized,
-        isStopped,
-        stream;
-
-    function setConfig(config) {
+        isStopped;
 
-        if (!config) return;
-
-        if (config.type) {
-            type = config.type;
-        }
-
-        if (config.stream) {
-            stream = config.stream;
-        }
-
-        if (config.mimeType) {
-            mimeType = config.mimeType;
-        }
-
-        if (config.adapter) {
-            adapter = config.adapter;
-        }
+    function setup() {
+        resetInitialSettings();
+        logger = debug.getLogger(instance);
 
-        if (config.mediaInfo) {
-            mediaInfo = config.mediaInfo;
-        }
+        indexHandler = DashHandler(context).create({
+            streamInfo: streamInfo,
+            type: type,
+            timelineConverter: timelineConverter,
+            dashMetrics: dashMetrics,
+            mediaPlayerModel: mediaPlayerModel,
+            baseURLController: baseURLController,
+            errHandler: errHandler,
+            settings: settings,
+            // boxParser: boxParser,
+            eventBus: eventBus,
+            events: events,
+            debug: debug,
+            requestModifier: RequestModifier(context).getInstance(),
+            dashConstants: dashConstants,
+            constants: constants,
+            urlUtils: URLUtils(context).getInstance()
+        });
 
-        if (config.bitrate) {
-            bitrate = config.bitrate;
-        }
+        representationController = RepresentationController(context).create({
+            streamId: streamInfo.id,
+            type: type,
+            abrController: abrController,
+            dashMetrics: dashMetrics,
+            playbackController: playbackController,
+            timelineConverter: timelineConverter,
+            dashConstants: dashConstants,
+            events: events,
+            eventBus: eventBus,
+            errors: errors
+        });
 
-        if (config.offlineStoreController) {
-            offlineStoreController = config.offlineStoreController;
-        }
-    }
+        fragmentModel = FragmentModel(context).create({
+            streamId: streamInfo.id,
+            dashMetrics: dashMetrics,
+            fragmentLoader: FragmentLoader(context).create({
+                dashMetrics: dashMetrics,
+                mediaPlayerModel: mediaPlayerModel,
+                errHandler: errHandler,
+                requestModifier: RequestModifier(context).getInstance(),
+                settings: settings,
+                eventBus: eventBus,
+                events: events,
+                errors: errors,
+                constants: constants,
+                dashConstants: dashConstants,
+                urlUtils: URLUtils(context).getInstance()
+            }),
+            debug: debug,
+            eventBus: eventBus,
+            events: events
+        });
 
-    function setup() {
-        resetInitialSettings();
-        logger = debug.getLogger(instance);
         eventBus.on(events.STREAM_COMPLETED, onStreamCompleted, instance);
         eventBus.on(events.FRAGMENT_LOADING_COMPLETED, onFragmentLoadingCompleted, instance);
     }
 
+    function initialize(_mediaInfo) {
+        mediaInfo = _mediaInfo;
+        indexHandler.initialize(false);
+        updateRepresentation(mediaInfo);
+    }
+
     function isInitRequest(request) {
         return request.type === 'InitializationSegment';
     }
@@ -164,29 +202,6 @@ function OfflineStreamProcessor(config) {
         isStopped = true;
     }
 
-    function initializeDownloader () {
-        updateRepresentation(mediaInfo);
-    }
-
-    function setDashElements(handler, fragModel, repController) {
-        indexHandler = handler;
-        indexHandler.initialize(false);
-
-        fragmentModel = fragModel;
-        representationController = repController;
-
-        initializeDownloader();
-    }
-
-    /**
-     * Initialization
-     * @memberof OfflineStreamProcessor#
-    */
-    function initialize() {
-        eventBus.trigger(OfflineEvents.DASH_ELEMENTS_CREATION_NEEDED, {sender: instance, config: {type: type,
-            mimeType: mimeType,
-            streamInfo: getStreamInfo()}} );
-    }
 
     function removeExecutedRequestsBeforeTime(time) {
         if (fragmentModel) {
@@ -292,10 +307,6 @@ function OfflineStreamProcessor(config) {
         representationController.updateData(null, voRepresentations, type, quality);
     }
 
-    function getStreamInfo() {
-        return stream ? stream.getStreamInfo() : null;
-    }
-
     function isUpdating() {
         return updating;
     }
@@ -321,12 +332,7 @@ function OfflineStreamProcessor(config) {
     function resetInitialSettings() {
         isInitialized = false;
         downloadedSegments = 0;
-        mimeType = null;
-        mediaInfo = null;
-        bitrate = null;
         updating = false;
-        type = null;
-        stream = null;
     }
 
     /**
@@ -343,8 +349,6 @@ function OfflineStreamProcessor(config) {
 
     instance = {
         initialize: initialize,
-        setConfig: setConfig,
-        getStreamInfo: getStreamInfo,
         getMediaInfo: getMediaInfo,
         getRepresentationController: getRepresentationController,
         removeExecutedRequestsBeforeTime: removeExecutedRequestsBeforeTime,
@@ -354,7 +358,6 @@ function OfflineStreamProcessor(config) {
         start: start,
         stop: stop,
         getAvailableSegmentsNumber: getAvailableSegmentsNumber,
-        setDashElements: setDashElements,
         reset: reset
     };
 
diff --git a/src/offline/constants/OfflineConstants.js b/src/offline/constants/OfflineConstants.js
index 02a0d524cf..b51f4fe376 100644
--- a/src/offline/constants/OfflineConstants.js
+++ b/src/offline/constants/OfflineConstants.js
@@ -37,8 +37,8 @@
 class OfflineConstants {
 
   init() {
-      this.OFFLINE_SCHEME = 'offline_indexdb';
-      this.OFFLINE_URL_REGEX = /^offline_indexdb:\/\//i;
+      this.OFFLINE_SCHEME = 'offline_indexeddb';
+      this.OFFLINE_URL_REGEX = /^offline_indexeddb:\/\//i;
       this.OFFLINE_STATUS_CREATED = 'created';
       this.OFFLINE_STATUS_STARTED = 'started';
       this.OFFLINE_STATUS_STOPPED = 'stopped';
diff --git a/src/offline/controllers/OfflineController.js b/src/offline/controllers/OfflineController.js
index 05559f622d..4755342816 100644
--- a/src/offline/controllers/OfflineController.js
+++ b/src/offline/controllers/OfflineController.js
@@ -36,103 +36,59 @@ import IndexDBOfflineLoader from '../net/IndexDBOfflineLoader';
 import OfflineUrlUtils from '../utils/OfflineUrlUtils';
 import OfflineEvents from '../events/OfflineEvents';
 import OfflineErrors from '../errors/OfflineErrors';
-import OfflineDownloadVo from '../vo/OfflineDownloadVo';
+import OfflineRecord from '../vo/OfflineDownloadVo';
 
 /**
- * @class OfflineController
+ * @module OfflineController
+ * @param {Object} config - dependencies
+ * @description Provides access to offline stream recording and playback functionality.
  */
-function OfflineController() {
+function OfflineController(config) {
 
     const context = this.context;
+    const errHandler = config.errHandler;
+    const events = config.events;
+    const errors = config.errors;
+    const settings = config.settings;
+    const eventBus = config.eventBus;
+    const debug = config.debug;
+    const manifestLoader = config.manifestLoader;
+    const manifestModel = config.manifestModel;
+    const mediaPlayerModel = config.mediaPlayerModel;
+    const abrController = config.abrController;
+    const playbackController = config.playbackController;
+    const dashMetrics = config.dashMetrics;
+    const timelineConverter = config.timelineConverter;
+    const adapter = config.adapter;
+    const manifestUpdater = config.manifestUpdater;
+    const baseURLController = config.baseURLController;
+    const schemeLoaderFactory = config.schemeLoaderFactory;
+    const constants = config.constants;
+    const dashConstants = config.dashConstants;
+    const urlUtils = config.urlUtils;
 
     let instance,
         downloads,
-        adapter,
-        schemeLoaderFactory,
-        debug,
         logger,
-        manifestLoader,
-        manifestModel,
-        manifestUpdater,
-        baseURLController,
         offlineStoreController,
-        urlUtils,
-        offlineUrlUtils,
-        events,
-        eventBus,
-        constants,
-        dashConstants,
-        errHandler;
+        offlineUrlUtils;
 
     function setup() {
+        logger = debug.getLogger(instance);
+        offlineStoreController = OfflineStoreController(context).create({
+            eventBus: config.eventBus,
+            errHandler: errHandler
+        });
         offlineUrlUtils = OfflineUrlUtils(context).getInstance();
+        urlUtils.registerUrlRegex(offlineUrlUtils.getRegex(), offlineUrlUtils);
+        schemeLoaderFactory.registerLoader(OfflineConstants.OFFLINE_SCHEME, IndexDBOfflineLoader);
 
         downloads = [];
     }
 
-    function setConfig(config) {
-        if (!config) return;
-
-        if (config.errHandler) {
-            errHandler = config.errHandler;
-        }
-
-        if (config.events && config.eventBus) {
-            events = config.events;
-            eventBus = config.eventBus;
-            offlineStoreController = OfflineStoreController(context).create({ eventBus: config.eventBus, errHandler: errHandler});
-        }
-
-        if (config.debug) {
-            debug = config.debug;
-            logger = debug.getLogger(instance);
-        }
-
-        if (config.manifestLoader) {
-            manifestLoader = config.manifestLoader;
-        }
-
-        if (config.manifestModel) {
-            manifestModel = config.manifestModel;
-        }
-
-        if (config.adapter) {
-            adapter = config.adapter;
-        }
-
-        if (config.manifestUpdater) {
-            manifestUpdater = config.manifestUpdater;
-        }
-
-        if (config.baseURLController) {
-            baseURLController = config.baseURLController;
-        }
-
-        if (config.schemeLoaderFactory) {
-            schemeLoaderFactory = config.schemeLoaderFactory;
-        }
-
-        if (config.constants) {
-            constants = config.constants;
-        }
-
-        if (config.dashConstants) {
-            dashConstants = config.dashConstants;
-        }
-
-        if (config.urlUtils) {
-            urlUtils = config.urlUtils;
-            urlUtils.registerUrlRegex(offlineUrlUtils.getRegex(), offlineUrlUtils);
-        }
-
-        schemeLoaderFactory.registerLoader(OfflineConstants.OFFLINE_SCHEME, IndexDBOfflineLoader);
-    }
-
     /*
     ---------------------------------------------------------------------------
-
         DOWNLOAD LIST FUNCTIONS
-
     ---------------------------------------------------------------------------
     */
     function getDownloadFromId(id) {
@@ -152,11 +108,18 @@ function OfflineController() {
                 id: id,
                 eventBus: eventBus,
                 events: events,
+                errors: errors,
+                settings: settings,
                 manifestLoader: manifestLoader,
                 manifestModel: manifestModel,
+                mediaPlayerModel: mediaPlayerModel,
                 manifestUpdater: manifestUpdater,
                 baseURLController: baseURLController,
+                abrController: abrController,
+                playbackController: playbackController,
                 adapter: adapter,
+                dashMetrics: dashMetrics,
+                timelineConverter: timelineConverter,
                 errHandler: errHandler,
                 offlineStoreController: offlineStoreController,
                 debug: debug,
@@ -202,14 +165,14 @@ function OfflineController() {
                     //register status changed event
                     waitForStatusChanged = true;
                     const downloadStopped = function () {
-                        eventBus.off(events.DOWNLOADING_STOPPED, downloadStopped, instance);
+                        eventBus.off(events.OFFLINE_RECORD_STOPPED, downloadStopped, instance);
                         return offlineStoreController.deleteDownloadById(id).then(function () {
                             resolve();
                         }).catch(function (err) {
                             reject(err);
                         });
                     };
-                    eventBus.on(events.DOWNLOADING_STOPPED, downloadStopped, instance);
+                    eventBus.on(events.OFFLINE_RECORD_STOPPED, downloadStopped, instance);
                 }
                 download.deleteDownload();
                 let index = downloads.indexOf(download);
@@ -222,20 +185,27 @@ function OfflineController() {
         });
     }
 
+    function generateManifestId() {
+        let timestamp = new Date().getTime();
+        return timestamp;
+    }
+
     /*
     ---------------------------------------------------------------------------
 
-        DOWNLOAD FUNCTIONS
+        OFFLINE CONTROLLER API
 
     ---------------------------------------------------------------------------
     */
-    function generateManifestId() {
-        let timestamp = new Date().getTime();
-        return timestamp;
-    }
-
-    function loadDownloadsFromStorage() {
 
+    /**
+     * Loads records from storage
+     * This methods has to be called first, to be sure that all downloads have been loaded
+     *
+     * @return {Promise} asynchronously resolved
+     * @memberof module:OfflineController
+     */
+    function loadRecordsFromStorage() {
         return new Promise(function (resolve, reject) {
             offlineStoreController.getAllManifests().then((items) => {
                 items.manifests.forEach((offline) => {
@@ -250,14 +220,44 @@ function OfflineController() {
         });
     }
 
-    function createDownload(url) {
+    /**
+     * Get all records from storage
+     *
+     * @return {Promise} asynchronously resolved with records
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function getAllRecords() {
+        let records = [];
+        downloads.forEach((download) => {
+            const record = new OfflineRecord();
+            record.id = download.getId();
+            record.progress = download.getDownloadProgression();
+            record.url = download.getOfflineUrl();
+            record.originalUrl = download.getManifestUrl();
+            record.status = download.getStatus();
+            records.push(record);
+        });
+        return records;
+    }
+
+    /**
+     * Create a new content record in storage and download manifest from url
+     *
+     * @param {string} manifestURL - the content manifest url
+     * @return {Promise} asynchronously resolved with record identifier
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function createRecord(manifestURL) {
         return new Promise(function (resolve, reject) {
             let id = generateManifestId();
 
             // create download controller
             let download = createDownloadFromId(id);
 
-            download.downloadFromUrl(url).then(() => {
+            download.downloadFromUrl(manifestURL).then(() => {
+                download.initDownload();
                 resolve(id);
             })
             .catch((e) => {
@@ -269,57 +269,72 @@ function OfflineController() {
         });
     }
 
-    function initDownload(id) {
+    /**
+     * Start downloading the record with selected tracks representations
+     *
+     * @param {string} id - record identifier
+     * @param {MediaInfo[]} mediaInfos - the selected tracks representations
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function startRecord(id, mediaInfos) {
         let download = getDownloadFromId(id);
         if (download) {
-            download.initDownload();
+            download.startDownload(mediaInfos);
         }
     }
 
-    function startDownload(id, selectedRepresentations) {
+    /**
+     * Stop downloading of the record
+     *
+     * @param {string} id - record identifier
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function stopRecord(id) {
         let download = getDownloadFromId(id);
         if (download) {
-            download.startDownload(selectedRepresentations);
+            download.stopDownload();
         }
     }
 
-    function getAllDownloads() {
-
-        let ret = [];
-        downloads.forEach((download) => {
-            const offlineDownload = new OfflineDownloadVo();
-            offlineDownload.id = download.getId();
-            offlineDownload.progress = download.getDownloadProgression();
-            offlineDownload.url = download.getOfflineUrl();
-            offlineDownload.originalUrl = download.getManifestUrl();
-            offlineDownload.status = download.getStatus();
-            ret.push(offlineDownload);
-        });
-
-        return ret;
-    }
-
-    function stopDownload(id) {
+    /**
+     * Resume downloading of the record
+     *
+     * @param {string} id - record identifier
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function resumeRecord(id) {
         let download = getDownloadFromId(id);
         if (download) {
-            download.stopDownload();
+            download.resumeDownload();
         }
     }
 
-    function deleteDownload(id) {
+    /**
+     * Deletes a record from storage
+     *
+     * @param {string} id - record identifier
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function deleteRecord(id) {
         return removeDownloadFromId(id).then(function () {
             return offlineStoreController.deleteDownloadById(id);
         });
     }
 
-    function resumeDownload(id) {
-        let download = getDownloadFromId(id);
-        if (download) {
-            download.resumeDownload();
-        }
-    }
 
-    function getDownloadProgression(id) {
+    /**
+     * Get download progression of a record
+     *
+     * @param {string} id - record identifier
+     * @return {number} percentage progression
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function getRecordProgression(id) {
         let download = getDownloadFromId(id);
         if (download) {
             return download.getDownloadProgression();
@@ -327,7 +342,12 @@ function OfflineController() {
         return 0;
     }
 
-    function resetDownloads() {
+    /**
+     * Reset all records
+     * @memberof module:OfflineController
+     * @instance
+     */
+    function resetRecords() {
         downloads.forEach((download) => {
             download.resetDownload();
         });
@@ -338,22 +358,20 @@ function OfflineController() {
      * @instance
      */
     function reset() {
-        resetDownloads();
+        resetRecords();
         schemeLoaderFactory.unregisterLoader(OfflineConstants.OFFLINE_SCHEME);
     }
 
     instance = {
-        setConfig: setConfig,
-        loadDownloadsFromStorage: loadDownloadsFromStorage,
-        createDownload: createDownload,
-        initDownload: initDownload,
-        startDownload: startDownload,
-        stopDownload: stopDownload,
-        resumeDownload: resumeDownload,
-        deleteDownload: deleteDownload,
-        getDownloadProgression: getDownloadProgression,
-        getAllDownloads: getAllDownloads,
-        resetDownloads: resetDownloads,
+        loadRecordsFromStorage: loadRecordsFromStorage,
+        createRecord: createRecord,
+        startRecord: startRecord,
+        stopRecord: stopRecord,
+        resumeRecord: resumeRecord,
+        deleteRecord: deleteRecord,
+        getRecordProgression: getRecordProgression,
+        getAllRecords: getAllRecords,
+        resetRecords: resetRecords,
         reset: reset
     };
 
diff --git a/src/offline/controllers/OfflineStoreController.js b/src/offline/controllers/OfflineStoreController.js
index 9d09a30b1a..0ef8d4858b 100644
--- a/src/offline/controllers/OfflineStoreController.js
+++ b/src/offline/controllers/OfflineStoreController.js
@@ -33,8 +33,9 @@ import OfflineErrors from '../errors/OfflineErrors';
 
 /**
  * @class OfflineStoreController
- * This class manages database store
- * @description Offline Storage Controller
+ * @description This class manages database store
+ * @param {object} config
+ * @ignore
  */
 function OfflineStoreController(config) {
 
diff --git a/src/offline/errors/OfflineErrors.js b/src/offline/errors/OfflineErrors.js
index aaffa725c4..727bda28f1 100644
--- a/src/offline/errors/OfflineErrors.js
+++ b/src/offline/errors/OfflineErrors.js
@@ -28,12 +28,16 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
+import ErrorsBase from '../../core/errors/ErrorsBase';
 /**
  * Offline Errors declaration
  * @class
  */
-class Errors {
+class OfflineErrors extends ErrorsBase {
     constructor () {
+
+        super();
+
         /**
          * Error code returned when an error occurs in offline module
          */
@@ -56,5 +60,5 @@ class Errors {
     }
 }
 
-let errors = new Errors();
-export default errors;
+let offlineErrors = new OfflineErrors();
+export default offlineErrors;
diff --git a/src/offline/events/OfflineEvents.js b/src/offline/events/OfflineEvents.js
index ba351f8b18..ae84999620 100644
--- a/src/offline/events/OfflineEvents.js
+++ b/src/offline/events/OfflineEvents.js
@@ -2,38 +2,34 @@ import EventsBase from './../../core/events/EventsBase';
 /**
  * These are offline events that should be sent to the player level.
  * @class
- * @ignore
  */
 class OfflineEvents extends EventsBase {
     constructor () {
         super();
 
-        this.DOWNLOADING_PAUSED = 'downloadingPaused';
-
         /**
-         * Triggered when all mediaInfo has been loaded on OfflineStream
-         * Return a list of available bitrateInfo needed to download stream.
-         */
-        this.DOWNLOADABLE_REPRESENTATIONS_LOADED = 'public_downloadableRepresentationsInfoLoaded';
-
-        this.DASH_ELEMENTS_CREATION_NEEDED = 'dashElementsCreationNeeded';
+        * Triggered when all mediaInfo has been loaded
+        * @event OfflineEvents#OFFLINE_RECORD_LOADEDMETADATA
+        */
+        this.OFFLINE_RECORD_LOADEDMETADATA = 'public_offlineRecordLoadedmetadata';
 
-        /** Triggered when the downloading is initialize and started
-        * @event OfflineEvents#DOWNLOADING_STOPPED
+        /**
+        * Triggered when a record is initialized and download is started
+        * @event OfflineEvents#OFFLINE_RECORD_STARTED
         */
-        this.DOWNLOADING_STARTED = 'public_downloadingStarted';
+        this.OFFLINE_RECORD_STARTED = 'public_offlineRecordStarted';
 
         /**
-        * Triggered when the user stop current downloading
-        * @event OfflineEvents#DOWNLOADING_STOPPED
+        * Triggered when the user stop downloading a record
+        * @event OfflineEvents#OFFLINE_RECORD_STOPPED
         */
-        this.DOWNLOADING_STOPPED = 'public_downloadingStopped';
+        this.OFFLINE_RECORD_STOPPED = 'public_offlineRecordStopped';
 
         /**
-        * Triggered when all fragments has been downloaded
-        * @event OfflineEvents#DOWNLOADING_FINISHED
+        * Triggered when all record has been downloaded
+        * @event OfflineEvents#OFFLINE_RECORD_FINISHED
         */
-        this.DOWNLOADING_FINISHED = 'public_downloadingFinished';
+        this.OFFLINE_RECORD_FINISHED = 'public_offlineRecordFinished';
     }
 }
 
diff --git a/src/offline/net/IndexDBOfflineLoader.js b/src/offline/net/IndexDBOfflineLoader.js
index d6012e1cd5..94b8aa0390 100644
--- a/src/offline/net/IndexDBOfflineLoader.js
+++ b/src/offline/net/IndexDBOfflineLoader.js
@@ -30,11 +30,6 @@
  */
 import IndexDBStore from '../storage/IndexDBStore';
 
-/**
- * @module
- * @description Load Offline resources
- * @param {Object} config - dependences
- */
 function IndexDBOfflineLoader(config) {
     config = config || {};
     const context = this.context;
@@ -57,8 +52,6 @@ function IndexDBOfflineLoader(config) {
     /**
      * Load manifest or fragment from indexeddb database
      * @param {object} config configuration of request
-     * @memberof module:offline
-     * @instance
      */
     function load(config) {
         if (config.request) {
diff --git a/src/offline/storage/IndexDBStore.js b/src/offline/storage/IndexDBStore.js
index 8318fed1f1..9967a10a85 100644
--- a/src/offline/storage/IndexDBStore.js
+++ b/src/offline/storage/IndexDBStore.js
@@ -32,8 +32,7 @@ const localforage = require('localforage');
 const entities = require('html-entities').XmlEntities;
 
 /**
- * @module  IndexDBStore
- * @description IndexedDB Access
+ * @ignore
  */
 function IndexDBStore() {
 
@@ -70,7 +69,6 @@ function IndexDBStore() {
     /**
      * Creates an instance of localforage to store fragments in indexed db
      * @param {string} storeName
-     * @memberof module:IndexDBStore
      * @instance
      */
     function createFragmentStore(storeName) {
@@ -89,7 +87,6 @@ function IndexDBStore() {
 
     /**
      * Update download status
-     * @memberof module:IndexDBStore
      * @param {number} manifestId
      * @param {string} newStatus
      * @returns {Promise} promise
@@ -108,7 +105,6 @@ function IndexDBStore() {
 
     /**
      * Updat last downloaded fragment index for representationId
-     * @memberof module:IndexDBStore
      * @param {number} manifestId - manifest id
       * @param {string} representationId - representation
      * @param {number} state - representation state
@@ -139,7 +135,6 @@ function IndexDBStore() {
 
     /**
      * Returns current downloaded segment index for representation
-     * @memberof module:IndexDBStore
      * @param {number} manifestId - manifest id
      * @param {string} representationId - representation
      * @returns {Promise} promise
@@ -162,7 +157,6 @@ function IndexDBStore() {
 
     /**
      * Returns a fragment from its key
-     * @memberof module:IndexDBStore
      * @param {number} manifestId
      * @param {number} key
      * @returns {Promise} fragment
@@ -185,7 +179,6 @@ function IndexDBStore() {
 
     /**
      * Returns a manifest from its identifier
-     * @memberof module:IndexDBStore
      * @param {number} id
      * @returns {Promise} {Object[]} manifests
      * @instance
@@ -215,7 +208,6 @@ function IndexDBStore() {
 
     /**
      * Returns all offline manifests
-     * @memberof module:IndexDBStore
      * @returns {Promise} {Object[]} manifests
      * @instance
      */
@@ -231,7 +223,6 @@ function IndexDBStore() {
 
     /**
      * Return higher manifest id
-     * @memberof module:IndexDBStore
      * @returns {Promise} number
      * @instance
      */
@@ -255,7 +246,6 @@ function IndexDBStore() {
 
     /**
      * Update manifest
-     * @memberof module:IndexDBStore
      * @param {Object} manifest updated manifest
      * @returns {Promise} promise asynchronously resolved
      * @instance
@@ -277,7 +267,6 @@ function IndexDBStore() {
 
     /**
      * save selected representation by user
-     * @memberof module:IndexDBStore
      * @param {Object} manifest updated manifest
      * @param {Object} selected selected representations
      * @returns {Promise} promise asynchronously resolved
@@ -300,7 +289,6 @@ function IndexDBStore() {
 
     /**
      * Store a manifest in manifest array
-     * @memberof module:IndexDBStore
      * @param {Object} manifest
      * @instance
      */
@@ -316,7 +304,6 @@ function IndexDBStore() {
 
     /**
      * Store a fragment in fragment store
-     * @memberof module:IndexDBStore
      * @param {number} manifestId
      * @param {number} fragmentId
      * @param {Object} fragmentData
@@ -345,7 +332,6 @@ function IndexDBStore() {
 
     /**
      * Remove all manifest and fragment store
-     * @memberof module:IndexDBStore
      * @returns {Promise} promise asynchronously resolved
      * @instance
      */
@@ -360,7 +346,6 @@ function IndexDBStore() {
     /**
      * Remove framgent store given its name
      * @param {string} storeName
-     * @memberof module:IndexDBStore
      * @instance
      */
     function dropFragmentStore(storeName) {
@@ -379,7 +364,6 @@ function IndexDBStore() {
 
     /**
      * Remove download given its id (fragmentStore + manifest entry in manifest array)
-     * @memberof module:IndexDBStore
      * @param {number} manifestId
      * @returns {Promise} promise asynchronously resolved
      * @instance
@@ -409,7 +393,6 @@ function IndexDBStore() {
 
     /**
      * Remove fragment store
-     * @memberof module:IndexDBStore
      * @param {string} storeName
      * @returns {Promise} promise asynchronously resolved
      * @instance
diff --git a/src/offline/utils/OfflineIndexDBManifestParser.js b/src/offline/utils/OfflineIndexDBManifestParser.js
index 3965c78286..d07f8f5824 100644
--- a/src/offline/utils/OfflineIndexDBManifestParser.js
+++ b/src/offline/utils/OfflineIndexDBManifestParser.js
@@ -30,13 +30,8 @@
  */
 
 const Entities = require('html-entities').XmlEntities;
-const OFFLINE_BASE_URL = 'offline_indexdb://';
+const OFFLINE_BASE_URL = 'offline_indexeddb://';
 
-/**
- * @module OfflineIndexDBManifestParser
- * @description  Parse online manifest to offline manifest
- * @param {Object} config - dependances
-*/
 function OfflineIndexDBManifestParser(config) {
 
     const manifestId = config.manifestId;
@@ -60,7 +55,6 @@ function OfflineIndexDBManifestParser(config) {
      * @param {string} XMLDoc - xml manifest
      * @param {object} representation
      * @returns {Promise} a promise that will be resolved or rejected at the end of encoding process
-     * @memberof module:OfflineIndexDBManifestParser
      * @instance
     */
     function parse(XMLDoc, representation) {
@@ -88,7 +82,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * URL encode parsed manifest
      * @param {string} DOM
-     * @memberof module:OfflineIndexDBManifestParser
      * @returns {string} Url encoded XML
      * @instance
     */
@@ -100,7 +93,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Update baseURL to point to local stored data P
      * @param {XML} currentMPD
-     * @memberof module:OfflineIndexDBManifestParser
      * @instance
     */
     function editBaseURLAttribute(currentMPD) {
@@ -150,7 +142,6 @@ function OfflineIndexDBManifestParser(config) {
      * Browse periods
      * @param {XML} currentMPD
      * @param {Object} representation
-     * @memberof module:OfflineIndexDBManifestParser
      * @instance
     */
     function browsePeriods(currentMPD, representation) {
@@ -164,7 +155,6 @@ function OfflineIndexDBManifestParser(config) {
      * Browse adapatation set to update data (delete those taht are not choosen by user ...)
      * @param {XML} currentPeriod
      * @param {Array} representationsToUpdate
-     * @memberof module:offline
      * @instance
     */
     function browseAdaptationsSet(currentPeriod, representationsToUpdate) {
@@ -227,7 +217,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Returns type of adapation set
      * @param {XML} currentAdaptationSet
-     * @memberof module:offline
      * @returns {string|null} type
      * @instance
     */
@@ -344,7 +333,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Returns mime-type of xml tag
      * @param {Object} tag
-     * @memberof module:offline
      * @returns {string|null} mimeType
      * @instance
     */
@@ -355,7 +343,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Returns representations of adaptation set
      * @param {XML} adaptation
-     * @memberof module:offline
      * @returns {XML} representations
      * @instance
     */
@@ -366,7 +353,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Return segment template list of adaptations set
      * @param {XML} currentAdaptationSet
-     * @memberof module:offline
      * @returns {XML} representations
      * @instance
     */
@@ -377,7 +363,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Return segment list tags of adaptations set
      * @param {XML} tag
-     * @memberof module:offline
      * @returns {XML} representations
      * @instance
     */
@@ -396,7 +381,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * @param {XML} segmentTemplate
      * @param {object} rep
-     * @memberof module:offline
      * @instance
     */
     function addSegmentTimelineElements(segmentTemplate, rep) {
@@ -431,7 +415,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Update attributes of segment templates to match offline urls
      * @param {Array} segmentsTemplates
-     * @memberof module:offline
      * @instance
     */
     function editSegmentTemplateAttributes(segmentsTemplates) {
@@ -448,7 +431,6 @@ function OfflineIndexDBManifestParser(config) {
      * Update attributes of segment list to match offline urls
      * @param {Array} segmentLists
      * @param {Object} representation
-     * @memberof module:offline
      * @instance
     */
     function editSegmentListAttributes(segmentLists, representation) {
@@ -478,7 +460,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * @param {XML} adaptationSet
      * @param {object} rep
-     * @memberof module:offline
      * @instance
     */
     function addSegmentTemplateAttributes(adaptationSet, rep) {
@@ -495,7 +476,6 @@ function OfflineIndexDBManifestParser(config) {
      * @param {XML} currentAdaptationSet
      * @param {XML} representations
      * @param {string} adaptationType
-     * @memberof module:offline
      * @instance
     */
     function findAndKeepOnlySelectedRepresentations(currentAdaptationSet, representations, adaptationType) {
@@ -513,7 +493,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Get id of first representation of adaptation set
      * @param {XMl} currentAdaptationSet
-     * @memberof module:offline
      * @returns {string} id
      * @instance
     */
@@ -526,7 +505,6 @@ function OfflineIndexDBManifestParser(config) {
     /**
      * Parse and returns fragments of offline url => xxxx://xxxx/fragmentId/
      * @param {string} url
-     * @memberof module:offline
      * @returns {string} fragmentId
      * @instance
     */
diff --git a/src/offline/utils/OfflineUrlUtils.js b/src/offline/utils/OfflineUrlUtils.js
index 244c22fb16..4b09cf2eb8 100644
--- a/src/offline/utils/OfflineUrlUtils.js
+++ b/src/offline/utils/OfflineUrlUtils.js
@@ -31,13 +31,6 @@
 
 import OfflineConstants from '../constants/OfflineConstants';
 
-/**
- * @module OfflineUrlUtils
- * @description Provides utility functions for operating on offline URLs.
- * Initially this is simply a method to determine the Base URL of a URL, but
- * should probably include other things provided all over the place such as
- * determining whether a URL is relative/absolute, resolving two paths etc.
- */
 function OfflineUrlUtils() {
 
     function setup() {
diff --git a/src/streaming/ManifestLoader.js b/src/streaming/ManifestLoader.js
index 6d0195016a..8073c088e1 100644
--- a/src/streaming/ManifestLoader.js
+++ b/src/streaming/ManifestLoader.js
@@ -41,12 +41,12 @@ import Events from '../core/events/Events';
 import Errors from '../core/errors/Errors';
 import FactoryMaker from '../core/FactoryMaker';
 import DashParser from '../dash/parser/DashParser';
-import Debug from '../core/Debug';
 
 function ManifestLoader(config) {
 
     config = config || {};
     const context = this.context;
+    const debug = config.debug;
     const eventBus = EventBus(context).getInstance();
     const urlUtils = URLUtils(context).getInstance();
 
@@ -60,7 +60,7 @@ function ManifestLoader(config) {
     let errHandler = config.errHandler;
 
     function setup() {
-        logger = Debug(context).getInstance().getLogger(instance);
+        logger = debug.getLogger(instance);
         eventBus.on(Events.XLINK_READY, onXlinkReady, instance);
 
         urlLoader = URLLoader(context).create({
@@ -105,7 +105,7 @@ function ManifestLoader(config) {
             }
             return parser;
         } else if (data.indexOf('MPD') > -1) {
-            return DashParser(context).create();
+            return DashParser(context).create({debug: debug});
         } else {
             return parser;
         }
diff --git a/src/streaming/ManifestUpdater.js b/src/streaming/ManifestUpdater.js
index f98a2f214e..d77e577c24 100644
--- a/src/streaming/ManifestUpdater.js
+++ b/src/streaming/ManifestUpdater.js
@@ -33,6 +33,7 @@ import Events from '../core/events/Events';
 import FactoryMaker from '../core/FactoryMaker';
 import Debug from '../core/Debug';
 import Errors from '../core/errors/Errors';
+import DashConstants from '../dash/constants/DashConstants';
 
 function ManifestUpdater() {
 
@@ -138,6 +139,13 @@ function ManifestUpdater() {
 
     function update(manifest) {
 
+        // See DASH-IF IOP v4.3 section 4.6.4 "Transition Phase between Live and On-Demand"
+        // Stop manifest update, ignore static manifest and signal end of dynamic stream to detect end of stream
+        if (manifestModel.getValue() && manifestModel.getValue().type === DashConstants.DYNAMIC && manifest.type === DashConstants.STATIC) {
+            eventBus.trigger(Events.DYNAMIC_STREAM_COMPLETED);
+            return;
+        }
+
         manifestModel.setValue(manifest);
 
         const date = new Date();
diff --git a/src/streaming/MediaPlayer.js b/src/streaming/MediaPlayer.js
index 1e0cde29b2..db7e526469 100644
--- a/src/streaming/MediaPlayer.js
+++ b/src/streaming/MediaPlayer.js
@@ -76,10 +76,6 @@ import DashJSError from './vo/DashJSError';
 import { checkParameterType } from './utils/SupervisorTools';
 import ManifestUpdater from './ManifestUpdater';
 import URLUtils from '../streaming/utils/URLUtils';
-import DashHandler from '../dash/DashHandler';
-import RepresentationController from '../dash/controllers/RepresentationController';
-import FragmentModel from './models/FragmentModel';
-import FragmentLoader from './FragmentLoader';
 import BoxParser from './utils/BoxParser';
 
 /* jscs:disable */
@@ -132,18 +128,17 @@ function MediaPlayer() {
         source,
         protectionData,
         mediaPlayerInitialized,
-        offlineControllerInitialized,
         streamingInitialized,
         playbackInitialized,
         autoPlay,
         abrController,
         schemeLoaderFactory,
-        offlineController,
         timelineConverter,
         mediaController,
         protectionController,
         metricsReportingController,
         mssHandler,
+        offlineController,
         adapter,
         mediaPlayerModel,
         errHandler,
@@ -170,7 +165,6 @@ function MediaPlayer() {
     function setup() {
         logger = debug.getLogger(instance);
         mediaPlayerInitialized = false;
-        offlineControllerInitialized = false;
         playbackInitialized = false;
         streamingInitialized = false;
         autoPlay = true;
@@ -326,6 +320,9 @@ function MediaPlayer() {
         restoreDefaultUTCTimingSources();
         setAutoPlay(AutoPlay !== undefined ? AutoPlay : true);
 
+        // Detect and initialize offline module to support offline contents playback
+        detectOffline();
+
         if (view) {
             attachView(view);
         }
@@ -334,9 +331,6 @@ function MediaPlayer() {
             attachSource(source);
         }
 
-        if (!offlineControllerInitialized) {
-            createOfflineControllers();
-        }
         logger.info('[dash.js ' + getVersion() + '] ' + 'MediaPlayer has been initialized');
     }
 
@@ -368,9 +362,7 @@ function MediaPlayer() {
 
         if (offlineController) {
             offlineController.reset();
-            offlineControllerInitialized = false;
-
-            eventBus.off(dashjs.OfflineController.events.DASH_ELEMENTS_CREATION_NEEDED, onDashElementsNeeded, instance); /* jshint ignore:line */
+            offlineController = null;
         }
     }
 
@@ -1108,232 +1100,13 @@ function MediaPlayer() {
     ---------------------------------------------------------------------------
     */
 
-    /** Loads downloads from storage
-     * This methos has to be called first, to be sure that all downloads have been loaded
-     * @return {Promise} asynchronously resolved
-     * @memberof module:MediaPlayer
-     */
-    function loadDownloadsFromStorage() {
-        if (!offlineControllerInitialized) {
-            createOfflineControllers();
-        }
-        return offlineController ? offlineController.loadDownloadsFromStorage() : Promise.reject();
-    }
-
-    /**
-     * Creates a new download object in storage
-     *
-     * @param {string} manifestURL - url of manifest
-     * @return {Promise} asynchronously resolved with identifier of download
-     * @memberof module:MediaPlayer
-     * @instance
-     */
-    function createDownload(manifestURL) {
-        if (!offlineControllerInitialized) {
-            createOfflineControllers();
-        }
-        return offlineController ? offlineController.createDownload(manifestURL) : Promise.reject();
-    }
-
-    /**
-     * Initialise download and gets manifest from url
-     *
-     * @param {string} id - identifier of download
-     * @memberof module:MediaPlayer
-     * @instance
-     */
-    function initDownload(id) {
-        if (offlineController) {
-            offlineController.initDownload(id);
-        }
-    }
-
     /**
-     * Start download of choosen representations
-     *
-     * @param {string} id - identifier of download
-     * @param {object} selectedRepresentations - choosen representations
+     * Detects if Offline is included and returns an instance of OfflineController.js
      * @memberof module:MediaPlayer
      * @instance
      */
-    function startDownload(id, selectedRepresentations) {
-        if (selectedRepresentations && offlineController) {
-            offlineController.startDownload(id, selectedRepresentations);
-        }
-    }
-
-    /**
-     * Delete download
-     *
-     * @param {string} id - identifier of download
-     * @memberof module:MediaPlayer
-     * @instance
-     */
-    function deleteDownload(id) {
-        if (!offlineControllerInitialized) {
-            createOfflineControllers();
-        }
-        return offlineController ? offlineController.deleteDownload(id) : Promise.reject();
-    }
-
-    /**
-     * Stop download
-     *
-     * @param {string} id - identifier of download
-     * @memberof module:MediaPlayer
-     * @instance
-     */
-    function stopDownload(id) {
-        if (offlineControllerInitialized && offlineController) {
-            offlineController.stopDownload(id);
-        }
-    }
-
-    /**
-     * Resume download
-     *
-     * @param {string} id - identifier of download
-     * @memberof module:MediaPlayer
-     * @instance
-     */
-    function resumeDownload(id) {
-        if (offlineControllerInitialized && offlineController) {
-            offlineController.resumeDownload(id);
-        }
-    }
-
-    /**
-     * Get progression of download
-     *
-     * @param {string} id - identifier of download
-     * @return {number} progression
-     * @memberof module:MediaPlayer
-     * @instance
-     */
-    function getDownloadProgression(id) {
-        if (offlineControllerInitialized) {
-            return offlineController ? offlineController.getDownloadProgression(id) : 0;
-        }
-    }
-
-    /**
-     * Get all saved downloads
-     *
-     * @return {Promise} asynchronously resolved with saved downloads
-     * @memberof module:MediaPlayer
-     * @instance
-     */
-    function getAllDownloads() {
-        if (!offlineControllerInitialized) {
-            createOfflineControllers();
-        }
-        return offlineController ? offlineController.getAllDownloads() : Promise.reject();
-    }
-
-    function onDashElementsNeeded(eventObj) {
-        let requestModifier = RequestModifier(context).getInstance();
-        let handler = DashHandler(context).create({
-            type: eventObj.config.type,
-            mediaPlayerModel: mediaPlayerModel,
-            mimeType: eventObj.config.mimeType,
-            baseURLController: baseURLController,
-            streamInfo: eventObj.config.streamInfo,
-            errHandler: errHandler,
-            timelineConverter: timelineConverter,
-            settings: settings,
-            dashMetrics: dashMetrics,
-            eventBus: eventBus,
-            events: Events,
-            errors: Errors,
-            debug: debug,
-            dashConstants: DashConstants,
-            requestModifier: requestModifier,
-            urlUtils: URLUtils(context).getInstance(),
-            boxParser: BoxParser(context).getInstance()
-        });
-        let repController = RepresentationController(context).create({
-            abrController: abrController,
-            dashMetrics: dashMetrics,
-            playbackController: playbackController,
-            timelineConverter: timelineConverter,
-            type: eventObj.config.type,
-            eventBus: eventBus,
-            events: Events,
-            errors: Errors,
-            dashConstants: DashConstants,
-            streamId: eventObj.config.streamInfo ? eventObj.config.streamInfo.id : null
-        });
-
-        let fragLoader = FragmentLoader(context).create({
-            mediaPlayerModel: mediaPlayerModel,
-            errHandler: errHandler,
-            requestModifier: requestModifier,
-            settings: settings,
-            dashMetrics: dashMetrics,
-            eventBus: eventBus,
-            events: Events,
-            errors: Errors,
-            dashConstants: DashConstants,
-            urlUtils: URLUtils(context).getInstance()
-        });
-
-        let fragModel = FragmentModel(context).create({
-            dashMetrics: dashMetrics,
-            fragmentLoader: fragLoader,
-            eventBus: eventBus,
-            events: Events,
-            debug: debug
-        });
-        eventObj.sender.setDashElements(handler, fragModel, repController);
-    }
-
-    function createOfflineControllers() {
-        if (!mediaPlayerInitialized) {
-            throw MEDIA_PLAYER_NOT_INITIALIZED_ERROR;
-        }
-
-        let OfflineController = dashjs.OfflineController; /* jshint ignore:line */
-
-        if (typeof OfflineController !== 'function') { //TODO need a better way to register/detect plugin components
-            return;
-        }
-
-        offlineController = OfflineController(context).create();
-
-        eventBus.on(OfflineController.events.DASH_ELEMENTS_CREATION_NEEDED, onDashElementsNeeded, instance);
-
-        MediaPlayerEvents.extend(OfflineController.events, {
-            publicOnly: true
-        });
-        Errors.extend(OfflineController.errors);
-
-        const manifestLoader = createManifestLoader();
-        const manifestUpdater = ManifestUpdater(context).create();
-
-        manifestUpdater.setConfig({
-            manifestModel: manifestModel,
-            adapter: adapter,
-            manifestLoader: manifestLoader,
-            errHandler: errHandler
-        });
-
-        offlineController.setConfig({
-            debug: debug,
-            manifestUpdater: manifestUpdater,
-            baseURLController: baseURLController,
-            manifestLoader: manifestLoader,
-            manifestModel: manifestModel,
-            adapter: adapter,
-            errHandler: errHandler,
-            schemeLoaderFactory: schemeLoaderFactory,
-            eventBus: eventBus,
-            events: Events,
-            constants: Constants,
-            dashConstants: DashConstants,
-            urlUtils: URLUtils(context).getInstance()
-        });
-
-        offlineControllerInitialized = true;
+    function getOfflineController() {
+        return detectOffline();
     }
 
     /*
@@ -1369,12 +1142,13 @@ function MediaPlayer() {
      * @param {string} lang - default language
      * @memberof module:MediaPlayer
      * @instance
+     * @deprecated will be removed in version 3.2.0. Please use setInitialMediaSettingsFor("fragmentedText", { lang: lang }) instead
      */
     function setTextDefaultLanguage(lang) {
+        logger.warn('setTextDefaultLanguage is deprecated and will be removed in version 3.2.0. Please use setInitialMediaSettingsFor("fragmentedText", { lang: lang }) instead');
         if (textController === undefined) {
             textController = TextController(context).getInstance();
         }
-
         textController.setTextDefaultLanguage(lang);
     }
 
@@ -1384,8 +1158,10 @@ function MediaPlayer() {
      * @return {string} the default language if it has been set using setTextDefaultLanguage
      * @memberof module:MediaPlayer
      * @instance
+     * @deprecated will be removed in version 3.2.0. Please use getInitialMediaSettingsFor("fragmentedText").lang instead
      */
     function getTextDefaultLanguage() {
+        logger.warn('getTextDefaultLanguage is deprecated and will be removed in version 3.2.0. Please use getInitialMediaSettingsFor("fragmentedText").lang instead');
         if (textController === undefined) {
             textController = TextController(context).getInstance();
         }
@@ -1700,11 +1476,14 @@ function MediaPlayer() {
      * @throws {@link module:MediaPlayer~MEDIA_PLAYER_NOT_INITIALIZED_ERROR MEDIA_PLAYER_NOT_INITIALIZED_ERROR} if called before initialize function
      * @instance
      */
-    function setQualityForSettingsFor(type, value) {
+    function setInitialMediaSettingsFor(type, value) {
         if (!mediaPlayerInitialized) {
             throw MEDIA_PLAYER_NOT_INITIALIZED_ERROR;
         }
         mediaController.setInitialSettings(type, value);
+        if (type === Constants.FRAGMENTED_TEXT) {
+            textController.setInitialSettings(value);
+        }
     }
 
     /**
@@ -1823,6 +1602,8 @@ function MediaPlayer() {
         PROTECTION MANAGEMENT
 
     ---------------------------------------------------------------------------
+    */
+
     /**
      * Detects if Protection is included and returns an instance of ProtectionController.js
      * @memberof module:MediaPlayer
@@ -1871,31 +1652,36 @@ function MediaPlayer() {
     */
 
     /**
-     * Return the thumbnail at time position.
-     * @returns {Thumbnail|null} - Thumbnail for the given time position. It returns null in case there are is not a thumbnails representation or
-     * if it doesn't contain a thumbnail for the given time position.
+     * Provide the thumbnail at time position. This can be asynchronous, so you must provide a callback ro retrieve thumbnails informations
      * @param {number} time - A relative time, in seconds, based on the return value of the {@link module:MediaPlayer#duration duration()} method is expected
-     * @param {function} callback - A Callback function provided when retrieving thumbnail
+     * @param {function} callback - A Callback function provided when retrieving thumbnail the given time position. Thumbnail object is null in case there are is not a thumbnails representation or
+     * if it doesn't contain a thumbnail for the given time position.
      * @memberof module:MediaPlayer
      * @instance
      */
-    function getThumbnail(time, callback) {
+    function provideThumbnail(time, callback) {
+        if (typeof callback !== 'function') {
+            return;
+        }
         if (time < 0) {
-            return null;
+            callback(null);
+            return;
         }
         const s = playbackController.getIsDynamic() ? getDVRSeekOffset(time) : time;
         const stream = streamController.getStreamForTime(s);
         if (stream === null) {
-            return null;
+            callback(null);
+            return;
         }
 
         const thumbnailController = stream.getThumbnailController();
         if (!thumbnailController) {
-            return null;
+            callback(null);
+            return;
         }
 
         const timeInPeriod = streamController.getTimeRelativeToStreamId(s, stream.getId());
-        return thumbnailController.get(timeInPeriod, callback);
+        return thumbnailController.provide(timeInPeriod, callback);
     }
 
     /*
@@ -2209,6 +1995,7 @@ function MediaPlayer() {
 
     function createManifestLoader() {
         return ManifestLoader(context).create({
+            debug: debug,
             errHandler: errHandler,
             dashMetrics: dashMetrics,
             mediaPlayerModel: mediaPlayerModel,
@@ -2301,6 +2088,63 @@ function MediaPlayer() {
         }
     }
 
+    function detectOffline() {
+        if (!mediaPlayerInitialized) {
+            throw MEDIA_PLAYER_NOT_INITIALIZED_ERROR;
+        }
+
+        if (offlineController) {
+            return offlineController;
+        }
+
+        // do not require Offline as dependencies as this is optional and intended to be loaded separately
+        let OfflineController = dashjs.OfflineController; /* jshint ignore:line */
+
+        if (typeof OfflineController === 'function') { //TODO need a better way to register/detect plugin components
+            Events.extend(OfflineController.events);
+            MediaPlayerEvents.extend(OfflineController.events, {
+                publicOnly: true
+            });
+            Errors.extend(OfflineController.errors);
+
+            const manifestLoader = createManifestLoader();
+            const manifestUpdater = ManifestUpdater(context).create();
+
+            manifestUpdater.setConfig({
+                manifestModel: manifestModel,
+                adapter: adapter,
+                manifestLoader: manifestLoader,
+                errHandler: errHandler
+            });
+
+            offlineController = OfflineController(context).create({
+                debug: debug,
+                manifestUpdater: manifestUpdater,
+                baseURLController: baseURLController,
+                manifestLoader: manifestLoader,
+                manifestModel: manifestModel,
+                mediaPlayerModel: mediaPlayerModel,
+                abrController: abrController,
+                playbackController: playbackController,
+                adapter: adapter,
+                errHandler: errHandler,
+                dashMetrics: dashMetrics,
+                timelineConverter: timelineConverter,
+                schemeLoaderFactory: schemeLoaderFactory,
+                eventBus: eventBus,
+                events: Events,
+                errors: Errors,
+                constants: Constants,
+                settings: settings,
+                dashConstants: DashConstants,
+                urlUtils: URLUtils(context).getInstance()
+            });
+            return offlineController;
+        }
+
+        return null;
+    }
+
     function getAsUTC(valToConvert) {
         let metric = dashMetrics.getCurrentDVRInfo();
         let availableFrom,
@@ -2315,8 +2159,9 @@ function MediaPlayer() {
     }
 
     function initializePlayback() {
-        if (offlineControllerInitialized) {
-            offlineController.resetDownloads();
+
+        if (offlineController) {
+            offlineController.resetRecords();
         }
 
         if (!streamingInitialized && source) {
@@ -2407,7 +2252,7 @@ function MediaPlayer() {
         getTracksFor: getTracksFor,
         getTracksForTypeFromManifest: getTracksForTypeFromManifest,
         getCurrentTrackFor: getCurrentTrackFor,
-        setInitialMediaSettingsFor: setQualityForSettingsFor,
+        setInitialMediaSettingsFor: setInitialMediaSettingsFor,
         getInitialMediaSettingsFor: getInitialMediaSettingsFor,
         setCurrentTrack: setCurrentTrack,
         getTrackSwitchModeFor: getTrackSwitchModeFor,
@@ -2431,20 +2276,12 @@ function MediaPlayer() {
         displayCaptionsOnTop: displayCaptionsOnTop,
         attachTTMLRenderingDiv: attachTTMLRenderingDiv,
         getCurrentTextTrackIndex: getCurrentTextTrackIndex,
-        getThumbnail: getThumbnail,
-        loadDownloadsFromStorage: loadDownloadsFromStorage,
-        createDownload: createDownload,
+        provideThumbnail: provideThumbnail,
         getDashAdapter: getDashAdapter,
+        getOfflineController: getOfflineController,
         getSettings: getSettings,
         updateSettings: updateSettings,
         resetSettings: resetSettings,
-        stopDownload: stopDownload,
-        getAllDownloads: getAllDownloads,
-        deleteDownload: deleteDownload,
-        resumeDownload: resumeDownload,
-        getDownloadProgression: getDownloadProgression,
-        startDownload: startDownload,
-        initDownload: initDownload,
         reset: reset
     };
 
diff --git a/src/streaming/Stream.js b/src/streaming/Stream.js
index b542636e93..985bafd837 100644
--- a/src/streaming/Stream.js
+++ b/src/streaming/Stream.js
@@ -67,10 +67,13 @@ function Stream(config) {
 
     let instance,
         logger,
+        streamInfo,
         streamProcessors,
+        isStreamInitialized,
         isStreamActivated,
         isMediaInitialized,
-        streamInfo,
+        hasVideoTrack,
+        hasAudioTrack,
         updateError,
         isUpdating,
         protectionController,
@@ -225,6 +228,9 @@ function Stream(config) {
     function resetInitialSettings() {
         deactivate();
         streamInfo = null;
+        isStreamInitialized = false;
+        hasVideoTrack = false;
+        hasAudioTrack = false;
         updateError = {};
         isUpdating = false;
     }
@@ -257,6 +263,19 @@ function Stream(config) {
         return streamInfo ? streamInfo.start : NaN;
     }
 
+    function getLiveStartTime() {
+        if (!streamInfo.manifestInfo.isDynamic) return NaN;
+        // Get live start time of the video stream (1st in array of streams)
+        // or audio if no video stream
+        for (let i = 0; i < streamProcessors.length; i++) {
+            if (streamProcessors[i].getType() === Constants.AUDIO ||
+                streamProcessors[i].getType() === Constants.VIDEO) {
+                return streamProcessors[i].getLiveStartTime();
+            }
+        }
+        return NaN;
+    }
+
     function getId() {
         return streamInfo ? streamInfo.id : null;
     }
@@ -265,6 +284,14 @@ function Stream(config) {
         return streamInfo;
     }
 
+    function getHasAudioTrack () {
+        return hasAudioTrack;
+    }
+
+    function getHasVideoTrack () {
+        return hasVideoTrack;
+    }
+
     function getThumbnailController() {
         return thumbnailController;
     }
@@ -343,7 +370,7 @@ function Stream(config) {
         logger.info('Stream -  Process track changed at current time ' + currentTime);
 
         logger.debug('Stream -  Update stream controller');
-        if (manifest.refreshManifestOnSwitchTrack) {
+        if (manifest.refreshManifestOnSwitchTrack) { // Applies only for MSS streams
             logger.debug('Stream -  Refreshing manifest for switch track');
             trackChangedEvent = e;
             manifestUpdater.refreshManifest();
@@ -379,14 +406,13 @@ function Stream(config) {
             abrController: abrController,
             playbackController: playbackController,
             mediaController: mediaController,
-            streamController: config.streamController,
             textController: textController,
             errHandler: errHandler,
             settings: settings,
             boxParser: boxParser
         });
 
-        streamProcessor.initialize(mediaSource);
+        streamProcessor.initialize(mediaSource, hasVideoTrack);
         abrController.updateTopQualityIndex(mediaInfo);
 
         if (optionalSettings) {
@@ -426,6 +452,14 @@ function Stream(config) {
             return;
         }
 
+        if (type === Constants.VIDEO) {
+            hasVideoTrack = true;
+        }
+
+        if (type === Constants.AUDIO) {
+            hasAudioTrack = true;
+        }
+
         for (let i = 0, ln = allMediaForType.length; i < ln; i++) {
             mediaInfo = allMediaForType[i];
 
@@ -455,14 +489,9 @@ function Stream(config) {
             return;
         }
 
-        if (type !== Constants.FRAGMENTED_TEXT || (type === Constants.FRAGMENTED_TEXT && textController.getTextDefaultEnabled())) {
-            mediaController.checkInitialMediaSettingsForType(type, streamInfo);
-            initialMediaInfo = mediaController.getCurrentTrackFor(type, streamInfo);
-        }
 
-        if (type === Constants.FRAGMENTED_TEXT && !textController.getTextDefaultEnabled()) {
-            initialMediaInfo = mediaController.getTracksFor(type, streamInfo)[0];
-        }
+        mediaController.checkInitialMediaSettingsForType(type, streamInfo);
+        initialMediaInfo = mediaController.getCurrentTrackFor(type, streamInfo);
 
         eventBus.trigger(Events.STREAM_INITIALIZING, {
             streamInfo: streamInfo,
@@ -591,11 +620,22 @@ function Stream(config) {
 
         if (error) {
             errHandler.error(error);
-        } else {
+        } else if (!isStreamInitialized) {
+            isStreamInitialized = true;
+            timelineConverter.setTimeSyncCompleted(true);
+
             eventBus.trigger(Events.STREAM_INITIALIZED, {
-                streamInfo: streamInfo
+                streamInfo: streamInfo,
+                liveStartTime: getLiveStartTime()
             });
         }
+
+        // (Re)start ScheduleController:
+        // - in case stream initialization has been completed after 'play' event (case for SegmentBase streams)
+        // - in case stream is complete but a track switch has been requested
+        for (let i = 0; i < ln && streamProcessors[i]; i++) {
+            streamProcessors[i].getScheduleController().start();
+        }
     }
 
     function getMediaInfo(type) {
@@ -624,9 +664,7 @@ function Stream(config) {
     }
 
     function onBufferingCompleted(e) {
-        if (e.streamInfo !== streamInfo) {
-            return;
-        }
+        if (e.streamId !== streamInfo.id) return;
 
         let processors = getProcessors();
         const ln = processors.length;
@@ -659,7 +697,7 @@ function Stream(config) {
     }
 
     function onInbandEvents(e) {
-        if (!streamInfo || e.streamInfo.id !== streamInfo.id) return;
+        if (!streamInfo || e.sender.getStreamInfo().id !== streamInfo.id) return;
         addInbandEvents(e.events);
     }
 
@@ -856,6 +894,8 @@ function Stream(config) {
         getStartTime: getStartTime,
         getId: getId,
         getStreamInfo: getStreamInfo,
+        getHasAudioTrack: getHasAudioTrack,
+        getHasVideoTrack: getHasVideoTrack,
         preload: preload,
         getThumbnailController: getThumbnailController,
         getBitrateListFor: getBitrateListFor,
diff --git a/src/streaming/StreamProcessor.js b/src/streaming/StreamProcessor.js
index f255241d8f..a8043d807f 100644
--- a/src/streaming/StreamProcessor.js
+++ b/src/streaming/StreamProcessor.js
@@ -30,12 +30,15 @@
  */
 import Constants from './constants/Constants';
 import DashConstants from '../dash/constants/DashConstants';
+import MetricsConstants from './constants/MetricsConstants';
+import FragmentModel from './models/FragmentModel';
 import BufferController from './controllers/BufferController';
 import TextBufferController from './text/TextBufferController';
 import ScheduleController from './controllers/ScheduleController';
 import RepresentationController from '../dash/controllers/RepresentationController';
+import LiveEdgeFinder from './utils/LiveEdgeFinder';
 import FactoryMaker from '../core/FactoryMaker';
-import { checkInteger } from './utils/SupervisorTools';
+import {checkInteger} from './utils/SupervisorTools';
 import EventBus from '../core/EventBus';
 import Events from '../core/events/Events';
 import DashHandler from '../dash/DashHandler';
@@ -44,6 +47,9 @@ import DashJSError from './vo/DashJSError';
 import Debug from '../core/Debug';
 import RequestModifier from './utils/RequestModifier';
 import URLUtils from '../streaming/utils/URLUtils';
+import BoxParser from './utils/BoxParser';
+import FragmentRequest from './vo/FragmentRequest';
+import {PlayListTrace} from './vo/metrics/PlayList';
 
 function StreamProcessor(config) {
 
@@ -62,7 +68,6 @@ function StreamProcessor(config) {
     let fragmentModel = config.fragmentModel;
     let abrController = config.abrController;
     let playbackController = config.playbackController;
-    let streamController = config.streamController;
     let mediaController = config.mediaController;
     let textController = config.textController;
     let dashMetrics = config.dashMetrics;
@@ -70,21 +75,33 @@ function StreamProcessor(config) {
     let boxParser = config.boxParser;
 
     let instance,
+        logger,
+        isDynamic,
         mediaInfo,
         mediaInfoArr,
         bufferController,
         scheduleController,
         representationController,
-        indexHandler;
+        liveEdgeFinder,
+        indexHandler,
+        streamInitialized;
 
     function setup() {
+        logger = Debug(context).getInstance().getLogger(instance);
         resetInitialSettings();
 
+        eventBus.on(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, instance, EventBus.EVENT_PRIORITY_HIGH); // High priority to be notified before Stream
+        eventBus.on(Events.QUALITY_CHANGE_REQUESTED, onQualityChanged, instance);
+        eventBus.on(Events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, instance);
+        eventBus.on(Events.MEDIA_FRAGMENT_NEEDED, onMediaFragmentNeeded, instance);
+        eventBus.on(Events.MEDIA_FRAGMENT_LOADED, onMediaFragmentLoaded, instance);
         eventBus.on(Events.BUFFER_LEVEL_UPDATED, onBufferLevelUpdated, instance);
-        eventBus.on(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, instance);
+        eventBus.on(Events.BUFFER_LEVEL_STATE_CHANGED, onBufferLevelStateChanged, instance);
+        eventBus.on(Events.BUFFER_CLEARED, onBufferCleared, instance);
+        eventBus.on(Events.SEEK_TARGET, onSeekTarget, instance);
     }
 
-    function initialize(mediaSource) {
+    function initialize(mediaSource, hasVideoTrack) {
         indexHandler = DashHandler(context).create({
             streamInfo: streamInfo,
             type: type,
@@ -105,28 +122,18 @@ function StreamProcessor(config) {
             urlUtils: URLUtils(context).getInstance()
         });
 
-        // initialize controllers
-        indexHandler.initialize(playbackController.getIsDynamic());
+        // Create live edge finder for dynamic streams
+        isDynamic = streamInfo.manifestInfo.isDynamic;
+        if (isDynamic) {
+            liveEdgeFinder = LiveEdgeFinder(context).create({
+                timelineConverter: timelineConverter
+            });
+        }
+
+        // Create/initialize controllers
+        indexHandler.initialize(isDynamic);
         abrController.registerStreamType(type, instance);
 
-        bufferController = createBufferControllerForType(type);
-        scheduleController = ScheduleController(context).create({
-            streamId: streamInfo.id,
-            type: type,
-            mimeType: mimeType,
-            adapter: adapter,
-            dashMetrics: dashMetrics,
-            timelineConverter: timelineConverter,
-            mediaPlayerModel: mediaPlayerModel,
-            fragmentModel: fragmentModel,
-            abrController: abrController,
-            playbackController: playbackController,
-            streamController: streamController,
-            textController: textController,
-            streamProcessor: instance,
-            mediaController: mediaController,
-            settings: settings
-        });
         representationController = RepresentationController(context).create({
             streamId: streamInfo.id,
             type: type,
@@ -139,10 +146,31 @@ function StreamProcessor(config) {
             eventBus: eventBus,
             errors: Errors
         });
+
+        bufferController = createBufferControllerForType(type);
         if (bufferController) {
             bufferController.initialize(mediaSource);
         }
-        scheduleController.initialize();
+
+        scheduleController = ScheduleController(context).create({
+            streamId: streamInfo.id,
+            type: type,
+            mimeType: mimeType,
+            adapter: adapter,
+            dashMetrics: dashMetrics,
+            mediaPlayerModel: mediaPlayerModel,
+            fragmentModel: fragmentModel,
+            abrController: abrController,
+            playbackController: playbackController,
+            textController: textController,
+            mediaController: mediaController,
+            bufferController: bufferController,
+            settings: settings
+        });
+
+        scheduleController.initialize(hasVideoTrack);
+
+        streamInitialized = false;
     }
 
     function resetInitialSettings() {
@@ -151,7 +179,9 @@ function StreamProcessor(config) {
     }
 
     function reset(errored, keepBuffers) {
-        indexHandler.reset();
+        if (indexHandler) {
+            indexHandler.reset();
+        }
 
         if (bufferController) {
             bufferController.reset(errored, keepBuffers);
@@ -168,12 +198,24 @@ function StreamProcessor(config) {
             representationController = null;
         }
 
+        if (liveEdgeFinder) {
+            liveEdgeFinder.reset();
+            liveEdgeFinder = null;
+        }
+
         if (abrController) {
             abrController.unRegisterStreamType(type);
         }
 
-        eventBus.off(Events.BUFFER_LEVEL_UPDATED, onBufferLevelUpdated, instance);
         eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, instance);
+        eventBus.off(Events.QUALITY_CHANGE_REQUESTED, onQualityChanged, instance);
+        eventBus.off(Events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, instance);
+        eventBus.off(Events.MEDIA_FRAGMENT_NEEDED, onMediaFragmentNeeded, instance);
+        eventBus.off(Events.MEDIA_FRAGMENT_LOADED, onMediaFragmentLoaded, instance);
+        eventBus.off(Events.BUFFER_LEVEL_UPDATED, onBufferLevelUpdated, instance);
+        eventBus.off(Events.BUFFER_LEVEL_STATE_CHANGED, onBufferLevelStateChanged, instance);
+        eventBus.off(Events.BUFFER_CLEARED, onBufferCleared, instance);
+        eventBus.off(Events.SEEK_TARGET, onSeekTarget, instance);
 
         resetInitialSettings();
         type = null;
@@ -184,20 +226,61 @@ function StreamProcessor(config) {
         return representationController ? representationController.isUpdating() : false;
     }
 
+
     function onDataUpdateCompleted(e) {
-        if (e.sender.getType() !== getType() || e.sender.getStreamId() !== streamInfo.id || !e.error || e.error.code !== Errors.SEGMENTS_UPDATE_FAILED_ERROR_CODE) return;
+        if (e.sender.getType() !== getType() || e.sender.getStreamId() !== streamInfo.id) return;
 
-        addDVRMetric();
+        if (!e.error) {
+            // Update representation if no error
+            scheduleController.setCurrentRepresentation(adapter.convertDataToRepresentationInfo(e.currentRepresentation));
+        }
+        if (!e.error || e.error.code === Errors.SEGMENTS_UPDATE_FAILED_ERROR_CODE) {
+            // Update has been postponed, update nevertheless DVR info
+            addDVRMetric();
+        }
+    }
+
+    function onQualityChanged(e) {
+        if (type !== e.mediaType || streamInfo.id !== e.streamInfo.id) return;
+        let representationInfo = getRepresentationInfo(e.newQuality);
+        scheduleController.setCurrentRepresentation(representationInfo);
+        dashMetrics.pushPlayListTraceMetrics(new Date(), PlayListTrace.REPRESENTATION_SWITCH_STOP_REASON);
+        dashMetrics.createPlaylistTraceMetrics(representationInfo.id, playbackController.getTime() * 1000, playbackController.getPlaybackRate());
     }
 
     function onBufferLevelUpdated(e) {
-        if (e.sender.getStreamProcessor() !== instance) return;
-        let manifest = manifestModel.getValue();
-        if (!manifest.doNotUpdateDVRWindowOnBufferUpdated) {
+        if (e.streamId !== streamInfo.id || e.mediaType !== type) return;
+
+        dashMetrics.addBufferLevel(type, new Date(), e.bufferLevel * 1000);
+
+        if (!manifestModel.getValue().doNotUpdateDVRWindowOnBufferUpdated) {
             addDVRMetric();
         }
     }
 
+    function onBufferLevelStateChanged(e) {
+        if (e.streamId !== streamInfo.id || e.mediaType !== type) return;
+
+        dashMetrics.addBufferState(type, e.state, scheduleController.getBufferTarget());
+        if (e.state === MetricsConstants.BUFFER_EMPTY && !playbackController.isSeeking()) {
+            // logger.info('Buffer is empty! Stalling!');
+            dashMetrics.pushPlayListTraceMetrics(new Date(), PlayListTrace.REBUFFERING_REASON);
+        }
+    }
+
+    function onBufferCleared(e) {
+        if (e.streamId !== streamInfo.id || e.mediaType !== type) return;
+
+        if (e.unintended) {
+            // There was an unintended buffer remove, probably creating a gap in the buffer, remove every saved request
+            fragmentModel.removeExecutedRequestsAfterTime(e.from);
+        } else {
+            fragmentModel.syncExecutedRequestsWithBufferedRange(
+                bufferController.getBuffer().getAllBufferRanges(),
+                streamInfo.duration);
+        }
+    }
+
     function addDVRMetric() {
         const manifestInfo = streamInfo.manifestInfo;
         const isDynamic = manifestInfo.isDynamic;
@@ -296,7 +379,7 @@ function StreamProcessor(config) {
     }
 
     function setMediaSource(mediaSource) {
-        bufferController.setMediaSource(mediaSource, getMediaInfo());
+        bufferController.setMediaSource(mediaSource, getMediaInfoArr());
     }
 
     function dischargePreBuffer() {
@@ -333,14 +416,145 @@ function StreamProcessor(config) {
         return bufferController ? bufferController.getBufferLevel() : 0;
     }
 
-    function switchInitData(representationId, bufferResetEnabled) {
+    function onInitFragmentNeeded(e) {
+        if (!e.sender || e.mediaType !== type || e.streamId !== streamInfo.id) return;
+
+        if (adapter.getIsTextTrack(mimeType) && !textController.isTextEnabled()) return;
+
+        if (bufferController && e.representationId) {
+            if (!bufferController.appendInitSegment(e.representationId)) {
+                // Init segment not in cache, send new request
+                const request = indexHandler ? indexHandler.getInitRequest(getMediaInfo(), representationController.getCurrentRepresentation()) : null;
+                scheduleController.processInitRequest(request);
+            }
+        }
+    }
+
+    function onMediaFragmentNeeded(e) {
+        if (!e.sender || e.mediaType !== type || e.streamId !== streamInfo.id) return;
+
+        let request;
+
+        // Don't schedule next fragments while pruning to avoid buffer inconsistencies
+        if (!bufferController.getIsPruningInProgress()) {
+            request = findNextRequest(e.seekTarget, e.replacement);
+            if (request) {
+                scheduleController.setSeekTarget(NaN);
+                if (!e.replacement) {
+                    if (!isNaN(request.startTime + request.duration)) {
+                        setIndexHandlerTime(request.startTime + request.duration);
+                    }
+                    request.delayLoadingTime = new Date().getTime() + scheduleController.getTimeToLoadDelay();
+                    scheduleController.setTimeToLoadDelay(0);
+                }
+            }
+        }
+
+        scheduleController.processMediaRequest(request);
+    }
+
+    function findNextRequest(seekTarget, requestToReplace) {
+        const representationInfo = getRepresentationInfo();
+        const hasSeekTarget = !isNaN(seekTarget);
+        const currentTime = playbackController.getNormalizedTime();
+        let time = hasSeekTarget ? seekTarget : getIndexHandlerTime();
+        let bufferIsDivided = false;
+        let request;
+
+        if (isNaN(time) || (getType() === Constants.FRAGMENTED_TEXT && !textController.isTextEnabled())) {
+            return null;
+        }
+        /**
+         * This is critical for IE/Safari/EDGE
+         * */
         if (bufferController) {
-            bufferController.switchInitData(streamInfo.id, representationId, bufferResetEnabled);
+            let range = bufferController.getRangeAt(time);
+            const playingRange = bufferController.getRangeAt(currentTime);
+            if ((range !== null || playingRange !== null) && !hasSeekTarget) {
+                if (!range || (playingRange && playingRange.start != range.start && playingRange.end != range.end)) {
+                    const hasDiscontinuities = bufferController.getBuffer().hasDiscontinuitiesAfter(currentTime);
+                    if (hasDiscontinuities && getType() !== Constants.FRAGMENTED_TEXT) {
+                        fragmentModel.removeExecutedRequestsAfterTime(playingRange.end);
+                        bufferIsDivided = true;
+                    }
+                }
+            }
         }
+
+        if (requestToReplace) {
+            time = requestToReplace.startTime + (requestToReplace.duration / 2);
+            request = getFragmentRequest(representationInfo, time, {
+                timeThreshold: 0,
+                ignoreIsFinished: true
+            });
+        } else {
+            // Use time just whenever is strictly needed
+            request = getFragmentRequest(representationInfo,
+                hasSeekTarget || bufferIsDivided ? time : undefined, {
+                    keepIdx: !hasSeekTarget && !bufferIsDivided
+                });
+
+            // Then, check if this request was downloaded or not
+            while (request && request.action !== FragmentRequest.ACTION_COMPLETE && fragmentModel.isFragmentLoaded(request)) {
+                // loop until we found not loaded fragment, or no fragment
+                request = getFragmentRequest(representationInfo);
+            }
+        }
+
+        return request;
+    }
+
+    function onMediaFragmentLoaded(e) {
+        const chunk = e.chunk;
+        if (chunk.streamId !== streamInfo.id || chunk.mediaInfo.type != type) return;
+
+        const bytes = chunk.bytes;
+        const quality = chunk.quality;
+        const currentRepresentation = getRepresentationInfo(quality);
+
+        const voRepresentation = representationController && currentRepresentation ? representationController.getRepresentationForQuality(currentRepresentation.quality) : null;
+        const eventStreamMedia = adapter.getEventsFor(currentRepresentation.mediaInfo);
+        const eventStreamTrack = adapter.getEventsFor(currentRepresentation, voRepresentation);
+
+        if (eventStreamMedia && eventStreamMedia.length > 0 || eventStreamTrack && eventStreamTrack.length > 0) {
+            const request = fragmentModel.getRequests({
+                state: FragmentModel.FRAGMENT_MODEL_EXECUTED,
+                quality: quality,
+                index: chunk.index
+            })[0];
+
+            const events = handleInbandEvents(bytes, request, eventStreamMedia, eventStreamTrack);
+            eventBus.trigger(Events.INBAND_EVENTS, {sender: instance, events: events});
+        }
+    }
+
+    function handleInbandEvents(data, request, mediaInbandEvents, trackInbandEvents) {
+        const fragmentStartTime = Math.max(!request || isNaN(request.startTime) ? 0 : request.startTime, 0);
+        const eventStreams = [];
+        const events = [];
+
+        /* Extract the possible schemeIdUri : If a DASH client detects an event message box with a scheme that is not defined in MPD, the client is expected to ignore it */
+        const inbandEvents = mediaInbandEvents.concat(trackInbandEvents);
+        for (let i = 0, ln = inbandEvents.length; i < ln; i++) {
+            eventStreams[inbandEvents[i].schemeIdUri + '/' + inbandEvents[i].value] = inbandEvents[i];
+        }
+
+        const isoFile = BoxParser(context).getInstance().parse(data);
+        const eventBoxes = isoFile.getBoxes('emsg');
+
+        for (let i = 0, ln = eventBoxes.length; i < ln; i++) {
+            const event = adapter.getEvent(eventBoxes[i], eventStreams, fragmentStartTime);
+
+            if (event) {
+                events.push(event);
+            }
+        }
+
+        return events;
     }
 
     function createBuffer(previousBuffers) {
-        return (getBuffer() || bufferController ? bufferController.createBuffer(mediaInfo, previousBuffers) : null);
+        return (getBuffer() || bufferController ? bufferController.createBuffer(mediaInfoArr, previousBuffers) : null);
     }
 
     function switchTrackAsked() {
@@ -357,39 +571,35 @@ function StreamProcessor(config) {
 
         if (type === Constants.VIDEO || type === Constants.AUDIO) {
             controller = BufferController(context).create({
-                streamId: streamInfo.id,
+                streamInfo: streamInfo,
                 type: type,
-                dashMetrics: dashMetrics,
                 mediaPlayerModel: mediaPlayerModel,
                 manifestModel: manifestModel,
                 fragmentModel: fragmentModel,
                 errHandler: errHandler,
-                streamController: streamController,
                 mediaController: mediaController,
+                representationController: representationController,
                 adapter: adapter,
                 textController: textController,
                 abrController: abrController,
                 playbackController: playbackController,
-                streamProcessor: instance,
                 settings: settings
             });
         } else {
             controller = TextBufferController(context).create({
-                streamId: streamInfo.id,
+                streamInfo: streamInfo,
                 type: type,
                 mimeType: mimeType,
-                dashMetrics: dashMetrics,
                 mediaPlayerModel: mediaPlayerModel,
                 manifestModel: manifestModel,
                 fragmentModel: fragmentModel,
                 errHandler: errHandler,
-                streamController: streamController,
                 mediaController: mediaController,
+                representationController: representationController,
                 adapter: adapter,
                 textController: textController,
                 abrController: abrController,
                 playbackController: playbackController,
-                streamProcessor: instance,
                 settings: settings
             });
         }
@@ -397,6 +607,71 @@ function StreamProcessor(config) {
         return controller;
     }
 
+
+    function getLiveStartTime() {
+        if (!isDynamic) return NaN;
+        if (!liveEdgeFinder) return NaN;
+
+        let liveStartTime = NaN;
+        const currentRepresentationInfo = getRepresentationInfo();
+        const liveEdge = liveEdgeFinder.getLiveEdge(currentRepresentationInfo);
+        const request = findRequestForLiveEdge(liveEdge, currentRepresentationInfo);
+
+        if (request) {
+            // When low latency mode is selected but browser doesn't support fetch
+            // start at the beginning of the segment to avoid consuming the whole buffer
+            if (settings.get().streaming.lowLatencyEnabled) {
+                liveStartTime = request.duration < mediaPlayerModel.getLiveDelay() ? request.startTime : request.startTime + request.duration - mediaPlayerModel.getLiveDelay();
+            } else {
+                liveStartTime = request.startTime;
+            }
+        }
+
+        return liveStartTime;
+    }
+
+    function findRequestForLiveEdge(liveEdge, currentRepresentationInfo) {
+        try {
+            let request = null;
+            let liveDelay = playbackController.getLiveDelay();
+            const dvrWindowSize = !isNaN(streamInfo.manifestInfo.DVRWindowSize) ? streamInfo.manifestInfo.DVRWindowSize : liveDelay;
+            const dvrWindowSafetyMargin = 0.1 * dvrWindowSize;
+            let startTime;
+
+            // Make sure that we have at least a valid request for the end of the DVR window, otherwise we might try forever
+            if (!isFinite(dvrWindowSize) || getFragmentRequest(currentRepresentationInfo, liveEdge - dvrWindowSize + dvrWindowSafetyMargin, {
+                ignoreIsFinished: true
+            })) {
+
+                // Try to find a request as close as possible to the targeted live edge
+                while (!request && liveDelay <= dvrWindowSize) {
+                    startTime = liveEdge - liveDelay;
+                    request = getFragmentRequest(currentRepresentationInfo, startTime, {
+                        ignoreIsFinished: true
+                    });
+                    if (!request) {
+                        liveDelay += 1; // Increase by one second for each iteration
+                    }
+                }
+            }
+
+            if (request) {
+                playbackController.setLiveDelay(liveDelay, true);
+            }
+            logger.debug('live edge: ' + liveEdge + ', live delay: ' + liveDelay + ', live target: ' + startTime);
+            return request;
+        } catch (e) {
+            return null;
+        }
+    }
+
+    function onSeekTarget(e) {
+        if (e.mediaType !== type || e.streamId !== streamInfo.id) return;
+
+        setIndexHandlerTime(e.time);
+        scheduleController.setSeekTarget(e.time);
+    }
+
     function setIndexHandlerTime(value) {
         if (indexHandler) {
             indexHandler.setCurrentTime(value);
@@ -415,9 +690,7 @@ function StreamProcessor(config) {
 
     function getInitRequest(quality) {
         checkInteger(quality);
-
         const representation = representationController ? representationController.getRepresentationForQuality(quality) : null;
-
         return indexHandler ? indexHandler.getInitRequest(getMediaInfo(), representation) : null;
     }
 
@@ -439,6 +712,10 @@ function StreamProcessor(config) {
         return fragRequest;
     }
 
+    function finalisePlayList(time, reason) {
+        dashMetrics.pushPlayListTraceMetrics(time, reason);
+    }
+
     instance = {
         initialize: initialize,
         isUpdating: isUpdating,
@@ -449,13 +726,13 @@ function StreamProcessor(config) {
         getRepresentationController: getRepresentationController,
         getRepresentationInfo: getRepresentationInfo,
         getBufferLevel: getBufferLevel,
-        switchInitData: switchInitData,
         isBufferingCompleted: isBufferingCompleted,
         createBuffer: createBuffer,
         updateStreamInfo: updateStreamInfo,
         getStreamInfo: getStreamInfo,
         selectMediaInfo: selectMediaInfo,
         addMediaInfo: addMediaInfo,
+        getLiveStartTime: getLiveStartTime,
         switchTrackAsked: switchTrackAsked,
         getMediaInfoArr: getMediaInfoArr,
         getMediaInfo: getMediaInfo,
@@ -469,6 +746,7 @@ function StreamProcessor(config) {
         resetIndexHandler: resetIndexHandler,
         getInitRequest: getInitRequest,
         getFragmentRequest: getFragmentRequest,
+        finalisePlayList: finalisePlayList,
         reset: reset
     };
 
@@ -476,5 +754,6 @@ function StreamProcessor(config) {
 
     return instance;
 }
+
 StreamProcessor.__dashjs_factory_name = 'StreamProcessor';
 export default FactoryMaker.getClassFactory(StreamProcessor);
diff --git a/src/streaming/controllers/BufferController.js b/src/streaming/controllers/BufferController.js
index 7d3532aaef..020178dd93 100644
--- a/src/streaming/controllers/BufferController.js
+++ b/src/streaming/controllers/BufferController.js
@@ -37,7 +37,6 @@ import AbrController from './AbrController';
 import MediaController from './MediaController';
 import EventBus from '../../core/EventBus';
 import Events from '../../core/events/Events';
-import BoxParser from '../utils/BoxParser';
 import FactoryMaker from '../../core/FactoryMaker';
 import Debug from '../../core/Debug';
 import InitCache from '../utils/InitCache';
@@ -57,18 +56,16 @@ function BufferController(config) {
     config = config || {};
     const context = this.context;
     const eventBus = EventBus(context).getInstance();
-    const dashMetrics = config.dashMetrics;
     const errHandler = config.errHandler;
     const fragmentModel = config.fragmentModel;
-    const streamController = config.streamController;
+    const representationController = config.representationController;
     const mediaController = config.mediaController;
     const adapter = config.adapter;
     const textController = config.textController;
     const abrController = config.abrController;
     const playbackController = config.playbackController;
-    const streamId = config.streamId;
+    const streamInfo = config.streamInfo;
     const type = config.type;
-    const streamProcessor = config.streamProcessor;
     const settings = config.settings;
 
     let instance,
@@ -88,10 +85,10 @@ function BufferController(config) {
         isPruningInProgress,
         isQuotaExceeded,
         initCache,
-        seekStartTime,
+        seekTarget,
         seekClearedBufferingCompleted,
         pendingPruningRanges,
-        bufferResetInProgress,
+        replacingBuffer,
         mediaChunk;
 
 
@@ -128,8 +125,13 @@ function BufferController(config) {
         eventBus.on(Events.SOURCEBUFFER_REMOVE_COMPLETED, onRemoved, this);
     }
 
-    function createBuffer(mediaInfo, oldBuffers) {
-        if (!initCache || !mediaInfo || !streamProcessor) return null;
+    function getRepresentationInfo(quality) {
+        return adapter.convertDataToRepresentationInfo(representationController.getRepresentationForQuality(quality));
+    }
+
+    function createBuffer(mediaInfoArr, oldBuffers) {
+        if (!initCache || !mediaInfoArr) return null;
+        const mediaInfo = mediaInfoArr[0];
         if (mediaSource) {
             try {
                 if (oldBuffers && oldBuffers[type]) {
@@ -138,7 +140,7 @@ function BufferController(config) {
                     buffer = SourceBufferSink(context).create(mediaSource, mediaInfo, onAppended.bind(this), settings.get().streaming.useAppendWindowEnd);
                 }
                 if (typeof buffer.getBuffer().initialize === 'function') {
-                    buffer.getBuffer().initialize(type, streamProcessor);
+                    buffer.getBuffer().initialize(type, streamInfo, mediaInfoArr, fragmentModel);
                 }
             } catch (e) {
                 logger.fatal('Caught error on create SourceBuffer: ' + e);
@@ -147,7 +149,7 @@ function BufferController(config) {
         } else {
             buffer = PreBufferSink(context).create(onAppended.bind(this));
         }
-        updateBufferTimestampOffset(streamProcessor.getRepresentationInfo(requiredQuality).MSETimeOffset);
+        updateBufferTimestampOffset(this.getRepresentationInfo(requiredQuality));
         return buffer;
     }
 
@@ -184,12 +186,8 @@ function BufferController(config) {
         }
     }
 
-    function isActive() {
-        return streamProcessor && streamController && streamProcessor.getStreamInfo();
-    }
-
     function onInitFragmentLoaded(e) {
-        if (e.chunk.streamId !== streamId || e.chunk.mediaInfo.type !== type) return;
+        if (e.chunk.streamId !== streamInfo.id || e.chunk.mediaInfo.type !== type) return;
 
         logger.info('Init fragment finished loading saving to', type + '\'s init cache');
         initCache.save(e.chunk);
@@ -197,41 +195,26 @@ function BufferController(config) {
         appendToBuffer(e.chunk);
     }
 
-    function switchInitData(streamId, representationId, bufferResetEnabled) {
-        const chunk = initCache.extract(streamId, representationId);
-        bufferResetInProgress = bufferResetEnabled === true ? bufferResetEnabled : false;
-        if (chunk) {
-            logger.info('Append Init fragment', type, ' with representationId:', chunk.representationId, ' and quality:', chunk.quality, ', data size:', chunk.bytes.byteLength);
-            appendToBuffer(chunk);
-        } else {
-            eventBus.trigger(Events.INIT_REQUESTED, { mediaType: type, sender: instance });
+    function appendInitSegment(representationId) {
+        // Get init segment from cache
+        const chunk = initCache.extract(streamInfo.id, representationId);
+
+        if (!chunk) {
+            // Init segment not in cache, shall be requested
+            return false;
         }
+
+        // Append init segment into buffer
+        logger.info('Append Init fragment', type, ' with representationId:', chunk.representationId, ' and quality:', chunk.quality, ', data size:', chunk.bytes.byteLength);
+        appendToBuffer(chunk);
+        return true;
     }
 
     function onMediaFragmentLoaded(e) {
-        if (e.chunk.streamId !== streamId || e.chunk.mediaInfo.type !== type) return;
-
         const chunk = e.chunk;
-        const bytes = chunk.bytes;
-        const quality = chunk.quality;
-        const currentRepresentation = streamProcessor.getRepresentationInfo(quality);
-        const representationController = streamProcessor.getRepresentationController();
-        const voRepresentation = representationController && currentRepresentation ? representationController.getRepresentationForQuality(currentRepresentation.quality) : null;
-        const eventStreamMedia = adapter.getEventsFor(currentRepresentation.mediaInfo);
-        const eventStreamTrack = adapter.getEventsFor(currentRepresentation, voRepresentation);
-
-        if (eventStreamMedia && eventStreamMedia.length > 0 || eventStreamTrack && eventStreamTrack.length > 0) {
-            const request = fragmentModel.getRequests({
-                state: FragmentModel.FRAGMENT_MODEL_EXECUTED,
-                quality: quality,
-                index: chunk.index
-            })[0];
-
-            const events = handleInbandEvents(bytes, request, eventStreamMedia, eventStreamTrack);
-            eventBus.trigger(Events.INBAND_EVENTS, { sender: instance, streamInfo: streamProcessor.getStreamInfo(), events: events });
-        }
+        if (chunk.streamId !== streamInfo.id || chunk.mediaInfo.type != type) return;
 
-        if (bufferResetInProgress) {
+        if (replacingBuffer) {
             mediaChunk = chunk;
             const ranges = buffer && buffer.getAllBufferRanges();
             if (ranges && ranges.length > 0 && playbackController.getTimeToStreamEnd() > STALL_THRESHOLD) {
@@ -251,14 +234,14 @@ function BufferController(config) {
         buffer.append(chunk);
 
         if (chunk.mediaInfo.type === Constants.VIDEO) {
-            eventBus.trigger(Events.VIDEO_CHUNK_RECEIVED, { chunk: chunk });
+            triggerEvent(Events.VIDEO_CHUNK_RECEIVED, { chunk: chunk });
         }
     }
 
     function showBufferRanges(ranges) {
         if (ranges && ranges.length > 0) {
             for (let i = 0, len = ranges.length; i < len; i++) {
-                logger.debug('Buffered Range', ranges.start(i), ' - ', ranges.end(i), ' currentTime = ', playbackController.getTime());
+                logger.debug('Buffered range: ' + ranges.start(i) + ' - ' + ranges.end(i) + ', currentTime = ', playbackController.getTime());
             }
         }
     }
@@ -281,7 +264,7 @@ function BufferController(config) {
             }
             if (e.error.code === QUOTA_EXCEEDED_ERROR_CODE || !hasEnoughSpaceToAppend()) {
                 logger.warn('Clearing playback buffer to overcome quota exceed situation');
-                eventBus.trigger(Events.QUOTA_EXCEEDED, { sender: instance, criticalBufferLevel: criticalBufferLevel }); //Tells ScheduleController to stop scheduling.
+                triggerEvent(Events.QUOTA_EXCEEDED, { criticalBufferLevel: criticalBufferLevel }); //Tells ScheduleController to stop scheduling.
                 pruneAllSafely(); // Then we clear the buffer and onCleared event will tell ScheduleController to start scheduling again.
             }
             return;
@@ -298,40 +281,70 @@ function BufferController(config) {
         if (appendedBytesInfo.segmentType === HTTPRequest.MEDIA_SEGMENT_TYPE) {
             showBufferRanges(ranges);
             onPlaybackProgression();
-        } else {
-            if (bufferResetInProgress) {
-                const currentTime = playbackController.getTime();
-                logger.debug('AppendToBuffer seek target should be ' + currentTime);
-                streamProcessor.getScheduleController().setSeekTarget(currentTime);
-                streamProcessor.setIndexHandlerTime(currentTime);
-            }
+            adjustSeekTarget();
+        } else if (replacingBuffer) {
+            // When replacing buffer due to switch track, and once new initialization segment has been appended
+            // (and previous buffered data removed) then seek stream to current time
+            const currentTime = playbackController.getTime();
+            logger.debug('AppendToBuffer seek target should be ' + currentTime);
+            triggerEvent(Events.SEEK_TARGET, {time: currentTime});
+        }
+
+        if (appendedBytesInfo) {
+            triggerEvent(appendedBytesInfo.endFragment ? Events.BYTES_APPENDED_END_FRAGMENT : Events.BYTES_APPENDED, {
+                quality: appendedBytesInfo.quality,
+                startTime: appendedBytesInfo.start,
+                index: appendedBytesInfo.index,
+                bufferedRanges: ranges,
+                mediaType: type
+            });
         }
+    }
 
-        const dataEvent = {
-            sender: instance,
-            quality: appendedBytesInfo.quality,
-            startTime: appendedBytesInfo.start,
-            index: appendedBytesInfo.index,
-            bufferedRanges: ranges
-        };
-        if (appendedBytesInfo && !appendedBytesInfo.endFragment) {
-            eventBus.trigger(Events.BYTES_APPENDED, dataEvent);
-        } else if (appendedBytesInfo) {
-            eventBus.trigger(Events.BYTES_APPENDED_END_FRAGMENT, dataEvent);
+    function adjustSeekTarget () {
+        // Check buffered data only for audio and video
+        if (type !== Constants.AUDIO && type !== Constants.VIDEO) return;
+        if (isNaN(seekTarget)) return;
+
+        // Check if current buffered range already contains seek target (and current video element time)
+        const currentTime = playbackController.getTime();
+        let range = getRangeAt(seekTarget, 0);
+        if (currentTime === seekTarget && range) return;
+
+        // Get buffered range corresponding to the seek target
+        const segmentDuration = representationController.getCurrentRepresentation().segmentDuration;
+        range = getRangeAt(seekTarget, segmentDuration);
+        if (!range) return;
+
+        if (Math.abs(currentTime - seekTarget) > segmentDuration) {
+            // If current video model time is decorrelated from seek target (and appended buffer) then seek video element
+            // (in case of live streams on some browsers/devices for which we can't set video element time at unavalaible range)
+
+            // Check if appended segment is not anterior from seek target (segments timeline/template tolerance)
+            if (seekTarget <= range.end) {
+                // Seek video element to seek target or range start if appended buffer starts after seek target (segments timeline/template tolerance)
+                playbackController.seek(Math.max(seekTarget, range.start), false, true);
+                seekTarget = NaN;
+            }
+        } else if (currentTime < range.start) {
+            // If appended buffer starts after seek target (segments timeline/template tolerance) then seek to range start
+            playbackController.seek(range.start, false, true);
+            seekTarget = NaN;
         }
     }
 
     function onQualityChanged(e) {
-        if (requiredQuality === e.newQuality || type !== e.mediaType || streamProcessor.getStreamInfo().id !== e.streamInfo.id) return;
+        if (e.streamInfo.id != streamInfo.id || e.mediaType !== type || requiredQuality === e.newQuality) return;
 
-        updateBufferTimestampOffset(streamProcessor.getRepresentationInfo(e.newQuality).MSETimeOffset);
+        updateBufferTimestampOffset(this.getRepresentationInfo(e.newQuality));
         requiredQuality = e.newQuality;
     }
 
     //**********************************************************************
     // START Buffer Level, State & Sufficiency Handling.
     //**********************************************************************
-    function onPlaybackSeeking(/*e*/) {
+    function onPlaybackSeeking(e) {
+        seekTarget = e.seekTime;
         if (isBufferingCompleted) {
             seekClearedBufferingCompleted = true;
             isBufferingCompleted = false;
@@ -347,7 +360,7 @@ function BufferController(config) {
     }
 
     function onPlaybackSeeked() {
-        setSeekStartTime(undefined);
+        seekTarget = NaN;
     }
 
     // Prune full buffer but what is around current time position
@@ -427,23 +440,12 @@ function BufferController(config) {
     }
 
     function getWorkingTime() {
-        // This function returns current working time for buffer (either start time or current time if playback has started)
-        let ret = playbackController.getTime();
-
-        if (seekStartTime) {
-            // if there is a seek start time, the first buffer data will be available on maximum value between first buffer range value and seek start time.
-            let ranges = buffer.getAllBufferRanges();
-            if (ranges && ranges.length) {
-                ret = Math.max(ranges.start(0), seekStartTime);
-            }
-        }
-        return ret;
+        return isNaN(seekTarget) ? playbackController.getTime() : seekTarget;
     }
 
     function onPlaybackProgression() {
-        if (!bufferResetInProgress || (type === Constants.FRAGMENTED_TEXT && textController.isTextEnabled())) {
+        if (!replacingBuffer || (type === Constants.FRAGMENTED_TEXT && textController.isTextEnabled())) {
             updateBufferLevel();
-            addBufferMetrics();
         }
     }
 
@@ -452,9 +454,7 @@ function BufferController(config) {
     }
 
     function onPlaybackPlaying() {
-        if (seekStartTime !== undefined) {
-            setSeekStartTime(undefined);
-        }
+        seekTarget = NaN;
         checkIfSufficientBuffer();
     }
 
@@ -468,7 +468,7 @@ function BufferController(config) {
         let len,
             i;
 
-        const toler = (tolerance || 0.15);
+        const toler = !isNaN(tolerance) ? tolerance : 0.15;
 
         if (ranges !== null && ranges !== undefined) {
             for (i = 0, len = ranges.length; i < len; i++) {
@@ -525,23 +525,17 @@ function BufferController(config) {
     function updateBufferLevel() {
         if (playbackController) {
             bufferLevel = getBufferLength(getWorkingTime() || 0);
-            eventBus.trigger(Events.BUFFER_LEVEL_UPDATED, { sender: instance, bufferLevel: bufferLevel });
+            triggerEvent(Events.BUFFER_LEVEL_UPDATED, { bufferLevel: bufferLevel });
             checkIfSufficientBuffer();
         }
     }
 
-    function addBufferMetrics() {
-        if (!isActive()) return;
-        dashMetrics.addBufferState(type, bufferState, streamProcessor.getScheduleController().getBufferTarget());
-        dashMetrics.addBufferLevel(type, new Date(), bufferLevel * 1000);
-    }
-
     function checkIfBufferingCompleted() {
         const isLastIdxAppended = maxAppendedIndex >= lastIndex - 1; // Handles 0 and non 0 based request index
         if (isLastIdxAppended && !isBufferingCompleted && buffer.discharge === undefined) {
             isBufferingCompleted = true;
             logger.debug('checkIfBufferingCompleted trigger BUFFERING_COMPLETED');
-            eventBus.trigger(Events.BUFFERING_COMPLETED, { sender: instance, streamInfo: streamProcessor.getStreamInfo() });
+            triggerEvent(Events.BUFFERING_COMPLETED);
         }
     }
 
@@ -553,7 +547,7 @@ function BufferController(config) {
             seekClearedBufferingCompleted = false;
             isBufferingCompleted = true;
             logger.debug('checkIfSufficientBuffer trigger BUFFERING_COMPLETED');
-            eventBus.trigger(Events.BUFFERING_COMPLETED, { sender: instance, streamInfo: streamProcessor.getStreamInfo() });
+            triggerEvent(Events.BUFFERING_COMPLETED);
         }
 
         // When the player is working in low latency mode, the buffer is often below STALL_THRESHOLD.
@@ -562,7 +556,7 @@ function BufferController(config) {
         if (((!settings.get().streaming.lowLatencyEnabled && bufferLevel < STALL_THRESHOLD) || bufferLevel === 0) && !isBufferingCompleted) {
             notifyBufferStateChanged(MetricsConstants.BUFFER_EMPTY);
         } else {
-            if (isBufferingCompleted || bufferLevel >= streamProcessor.getStreamInfo().manifestInfo.minBufferTime) {
+            if (isBufferingCompleted || bufferLevel >= streamInfo.manifestInfo.minBufferTime) {
                 notifyBufferStateChanged(MetricsConstants.BUFFER_LOADED);
             }
         }
@@ -576,38 +570,12 @@ function BufferController(config) {
         }
 
         bufferState = state;
-        addBufferMetrics();
 
-        eventBus.trigger(Events.BUFFER_LEVEL_STATE_CHANGED, { sender: instance, state: state, mediaType: type, streamInfo: streamProcessor.getStreamInfo() });
-        eventBus.trigger(state === MetricsConstants.BUFFER_LOADED ? Events.BUFFER_LOADED : Events.BUFFER_EMPTY, { mediaType: type });
+        triggerEvent(Events.BUFFER_LEVEL_STATE_CHANGED, { state: state });
+        triggerEvent(state === MetricsConstants.BUFFER_LOADED ? Events.BUFFER_LOADED : Events.BUFFER_EMPTY);
         logger.debug(state === MetricsConstants.BUFFER_LOADED ? 'Got enough buffer to start' : 'Waiting for more buffer before starting playback');
     }
 
-    function handleInbandEvents(data, request, mediaInbandEvents, trackInbandEvents) {
-        const fragmentStartTime = Math.max(!request || isNaN(request.startTime) ? 0 : request.startTime, 0);
-        const eventStreams = [];
-        const events = [];
-
-        /* Extract the possible schemeIdUri : If a DASH client detects an event message box with a scheme that is not defined in MPD, the client is expected to ignore it */
-        const inbandEvents = mediaInbandEvents.concat(trackInbandEvents);
-        for (let i = 0, ln = inbandEvents.length; i < ln; i++) {
-            eventStreams[inbandEvents[i].schemeIdUri + '/' + inbandEvents[i].value] = inbandEvents[i];
-        }
-
-        const isoFile = BoxParser(context).getInstance().parse(data);
-        const eventBoxes = isoFile.getBoxes('emsg');
-
-        for (let i = 0, ln = eventBoxes.length; i < ln; i++) {
-            const event = adapter.getEvent(eventBoxes[i], eventStreams, fragmentStartTime);
-
-            if (event) {
-                events.push(event);
-            }
-        }
-
-        return events;
-    }
-
     /* prune buffer on our own in background to avoid browsers pruning buffer silently */
     function pruneBuffer() {
         if (!buffer || type === Constants.FRAGMENTED_TEXT) {
@@ -712,10 +680,6 @@ function BufferController(config) {
         if (currentTime < range.end) {
             isBufferingCompleted = false;
             maxAppendedIndex = 0;
-            if (!bufferResetInProgress) {
-                streamProcessor.getScheduleController().setSeekTarget(currentTime);
-                streamProcessor.setIndexHandlerTime(currentTime);
-            }
         }
 
         buffer.remove(range.start, range.end, range.force);
@@ -735,49 +699,56 @@ function BufferController(config) {
 
         if (e.unintended) {
             logger.warn('Detected unintended removal from:', e.from, 'to', e.to, 'setting index handler time to', e.from);
-            streamProcessor.setIndexHandlerTime(e.from);
+            triggerEvent(Events.SEEK_TARGET, {time: e.from});
         }
 
         if (isPruningInProgress) {
             clearNextRange();
         } else {
-            if (!bufferResetInProgress) {
-                logger.debug('onRemoved : call updateBufferLevel');
+            if (!replacingBuffer) {
                 updateBufferLevel();
-                addBufferMetrics();
             } else {
-                bufferResetInProgress = false;
+                replacingBuffer = false;
                 if (mediaChunk) {
                     appendToBuffer(mediaChunk);
                 }
             }
-            eventBus.trigger(Events.BUFFER_CLEARED, { sender: instance, from: e.from, to: e.to, unintended: e.unintended,  hasEnoughSpaceToAppend: hasEnoughSpaceToAppend(), quotaExceeded: isQuotaExceeded });
+            triggerEvent(Events.BUFFER_CLEARED, {
+                from: e.from,
+                to: e.to,
+                unintended: e.unintended,
+                hasEnoughSpaceToAppend: hasEnoughSpaceToAppend(),
+                quotaExceeded: isQuotaExceeded });
         }
         //TODO - REMEMBER removed a timerout hack calling clearBuffer after manifestInfo.minBufferTime * 1000 if !hasEnoughSpaceToAppend() Aug 04 2016
     }
 
-    function updateBufferTimestampOffset(MSETimeOffset) {
+    function updateBufferTimestampOffset(representationInfo) {
+        if (!representationInfo || representationInfo.MSETimeOffset === undefined) return;
         // Each track can have its own @presentationTimeOffset, so we should set the offset
         // if it has changed after switching the quality or updating an mpd
         if (buffer && buffer.updateTimestampOffset) {
-            buffer.updateTimestampOffset(MSETimeOffset);
+            buffer.updateTimestampOffset(representationInfo.MSETimeOffset);
         }
     }
 
     function onDataUpdateCompleted(e) {
-        if (e.sender.getType() !== streamProcessor.getType() || e.sender.getStreamId() !== streamProcessor.getStreamInfo().id || e.error) return;
-        updateBufferTimestampOffset(e.currentRepresentation.MSETimeOffset);
+        if (e.sender.getStreamId() !== streamInfo.id || e.sender.getType() !== type) return;
+        if (e.error) return;
+        updateBufferTimestampOffset(e.currentRepresentation);
     }
 
     function onStreamCompleted(e) {
-        if (e.request.mediaInfo.streamInfo.id !== streamId || e.request.mediaType !== type) return;
+        if (e.request.mediaInfo.streamInfo.id !== streamInfo.id || e.request.mediaType !== type) return;
         lastIndex = e.request.index;
         checkIfBufferingCompleted();
     }
 
     function onCurrentTrackChanged(e) {
+        if (e.newMediaInfo.streamInfo.id !== streamInfo.id || e.newMediaInfo.type !== type) return;
+
         const ranges = buffer && buffer.getAllBufferRanges();
-        if (!ranges || (e.newMediaInfo.type !== type) || (e.newMediaInfo.streamInfo.id !== streamProcessor.getStreamInfo().id)) return;
+        if (!ranges) return;
 
         logger.info('Track change asked');
         if (mediaController.getSwitchMode(type) === MediaController.TRACK_SWITCH_MODE_ALWAYS_REPLACE) {
@@ -805,14 +776,6 @@ function BufferController(config) {
         return type;
     }
 
-    function getStreamProcessor() {
-        return streamProcessor;
-    }
-
-    function setSeekStartTime(value) {
-        seekStartTime = value;
-    }
-
     function getBuffer() {
         return buffer;
     }
@@ -839,6 +802,10 @@ function BufferController(config) {
         return mediaSource;
     }
 
+    function replaceBuffer() {
+        replacingBuffer = true;
+    }
+
     function getIsBufferingCompleted() {
         return isBufferingCompleted;
     }
@@ -867,6 +834,14 @@ function BufferController(config) {
         return (totalBufferedTime < criticalBufferLevel);
     }
 
+    function triggerEvent(eventType, data) {
+        let payload = data || {};
+        payload.sender = instance;
+        payload.mediaType = type;
+        payload.streamId = streamInfo.id;
+        eventBus.trigger(eventType, payload);
+    }
+
     function resetInitialSettings(errored, keepBuffers) {
         criticalBufferLevel = Number.POSITIVE_INFINITY;
         bufferState = undefined;
@@ -881,6 +856,7 @@ function BufferController(config) {
         bufferLevel = 0;
         wallclockTicked = 0;
         pendingPruningRanges = [];
+        seekTarget = NaN;
 
         if (buffer) {
             if (!errored) {
@@ -890,16 +866,15 @@ function BufferController(config) {
             buffer = null;
         }
 
-        bufferResetInProgress = false;
+        replacingBuffer = false;
     }
 
     function reset(errored, keepBuffers) {
         eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, this);
-        eventBus.off(Events.QUALITY_CHANGE_REQUESTED, onQualityChanged, this);
         eventBus.off(Events.INIT_FRAGMENT_LOADED, onInitFragmentLoaded, this);
         eventBus.off(Events.MEDIA_FRAGMENT_LOADED, onMediaFragmentLoaded, this);
+        eventBus.off(Events.QUALITY_CHANGE_REQUESTED, onQualityChanged, this);
         eventBus.off(Events.STREAM_COMPLETED, onStreamCompleted, this);
-        eventBus.off(Events.CURRENT_TRACK_CHANGED, onCurrentTrackChanged, this);
         eventBus.off(Events.PLAYBACK_PLAYING, onPlaybackPlaying, this);
         eventBus.off(Events.PLAYBACK_PROGRESS, onPlaybackProgression, this);
         eventBus.off(Events.PLAYBACK_TIME_UPDATED, onPlaybackProgression, this);
@@ -908,6 +883,7 @@ function BufferController(config) {
         eventBus.off(Events.PLAYBACK_SEEKED, onPlaybackSeeked, this);
         eventBus.off(Events.PLAYBACK_STALLED, onPlaybackStalled, this);
         eventBus.off(Events.WALLCLOCK_TIME_UPDATED, onWallclockTimeUpdated, this);
+        eventBus.off(Events.CURRENT_TRACK_CHANGED, onCurrentTrackChanged, this);
         eventBus.off(Events.SOURCEBUFFER_REMOVE_COMPLETED, onRemoved, this);
 
         resetInitialSettings(errored, keepBuffers);
@@ -915,20 +891,20 @@ function BufferController(config) {
 
     instance = {
         getBufferControllerType: getBufferControllerType,
+        getRepresentationInfo: getRepresentationInfo,
         initialize: initialize,
         createBuffer: createBuffer,
         dischargePreBuffer: dischargePreBuffer,
         getType: getType,
-        getStreamProcessor: getStreamProcessor,
-        setSeekStartTime: setSeekStartTime,
         getBuffer: getBuffer,
         setBuffer: setBuffer,
         getBufferLevel: getBufferLevel,
         getRangeAt: getRangeAt,
         setMediaSource: setMediaSource,
         getMediaSource: getMediaSource,
+        appendInitSegment: appendInitSegment,
+        replaceBuffer: replaceBuffer,
         getIsBufferingCompleted: getIsBufferingCompleted,
-        switchInitData: switchInitData,
         getIsPruningInProgress: getIsPruningInProgress,
         reset: reset
     };
diff --git a/src/streaming/controllers/MediaController.js b/src/streaming/controllers/MediaController.js
index 4a7fc12b46..cf809b4298 100644
--- a/src/streaming/controllers/MediaController.js
+++ b/src/streaming/controllers/MediaController.js
@@ -78,12 +78,6 @@ function MediaController() {
         const tracksForType = getTracksFor(type, streamInfo);
         const tracks = [];
 
-        if (type === Constants.FRAGMENTED_TEXT) {
-            // Choose the first track
-            setTrack(tracksForType[0]);
-            return;
-        }
-
         if (!settings) {
             settings = domStorage.getSavedMediaSettings(type);
             setInitialSettings(type, settings);
@@ -100,10 +94,10 @@ function MediaController() {
         }
 
         if (tracks.length === 0) {
-            setTrack(selectInitialTrack(tracksForType));
+            setTrack(selectInitialTrack(type, tracksForType), true);
         } else {
             if (tracks.length > 1) {
-                setTrack(selectInitialTrack(tracks));
+                setTrack(selectInitialTrack(type, tracks));
             } else {
                 setTrack(tracks[0]);
             }
@@ -185,9 +179,10 @@ function MediaController() {
 
     /**
      * @param {MediaInfo} track
+     * @param {boolean} noSettingsSave specify if settings must be not be saved
      * @memberof MediaController#
      */
-    function setTrack(track) {
+    function setTrack(track, noSettingsSave) {
         if (!track || !track.streamInfo) return;
 
         const type = track.type;
@@ -199,28 +194,31 @@ function MediaController() {
 
         tracks[id][type].current = track;
 
-        if (tracks[id][type].current) {
+        if (tracks[id][type].current && !(noSettingsSave && type === Constants.FRAGMENTED_TEXT)) {
             eventBus.trigger(Events.CURRENT_TRACK_CHANGED, {oldMediaInfo: current, newMediaInfo: track, switchMode: switchMode[type]});
         }
 
-        let settings = extractSettings(track);
+        if (!noSettingsSave) {
 
-        if (!settings || !tracks[id][type].storeLastSettings) return;
+            let settings = extractSettings(track);
 
-        if (settings.roles) {
-            settings.role = settings.roles[0];
-            delete settings.roles;
-        }
+            if (!settings || !tracks[id][type].storeLastSettings) return;
 
-        if (settings.accessibility) {
-            settings.accessibility = settings.accessibility[0];
-        }
+            if (settings.roles) {
+                settings.role = settings.roles[0];
+                delete settings.roles;
+            }
 
-        if (settings.audioChannelConfiguration) {
-            settings.audioChannelConfiguration = settings.audioChannelConfiguration[0];
-        }
+            if (settings.accessibility) {
+                settings.accessibility = settings.accessibility[0];
+            }
+
+            if (settings.audioChannelConfiguration) {
+                settings.audioChannelConfiguration = settings.audioChannelConfiguration[0];
+            }
 
-        domStorage.setSavedMediaSettings(type, settings);
+            domStorage.setSavedMediaSettings(type, settings);
+        }
     }
 
     /**
@@ -245,6 +243,13 @@ function MediaController() {
         return initialSettings[type];
     }
 
+    /**
+     * @memberof MediaController#
+     */
+    function saveTextSettingsDisabled() {
+        domStorage.setSavedMediaSettings(Constants.FRAGMENTED_TEXT, null);
+    }
+
     /**
      * @param {string} type
      * @param {string} mode
@@ -384,13 +389,17 @@ function MediaController() {
     function resetInitialSettings() {
         initialSettings = {
             audio: null,
-            video: null
+            video: null,
+            fragmentedText: null
         };
     }
 
-    function selectInitialTrack(tracks) {
+    function selectInitialTrack(type, tracks) {
+        if (type === Constants.FRAGMENTED_TEXT) return tracks[0];
+
         let mode = getSelectionModeForInitialTrack();
         let tmpArr = [];
+
         const getTracksWithHighestBitrate = function (trackArr) {
             let max = 0;
             let result = [];
@@ -496,6 +505,8 @@ function MediaController() {
         getSelectionModeForInitialTrack: getSelectionModeForInitialTrack,
         isMultiTrackSupportedByType: isMultiTrackSupportedByType,
         isTracksEqual: isTracksEqual,
+        matchSettings: matchSettings,
+        saveTextSettingsDisabled: saveTextSettingsDisabled,
         setConfig: setConfig,
         reset: reset
     };
diff --git a/src/streaming/controllers/PlaybackController.js b/src/streaming/controllers/PlaybackController.js
index f4f28a7e21..221b31dc4f 100644
--- a/src/streaming/controllers/PlaybackController.js
+++ b/src/streaming/controllers/PlaybackController.js
@@ -49,18 +49,17 @@ function PlaybackController() {
         adapter,
         videoModel,
         timelineConverter,
-        liveStartTime,
+        streamSwitch,
+        streamSeekTime,
         wallclockTimeIntervalId,
-        earliestTime,
         liveDelay,
-        bufferedRange,
         streamInfo,
         isDynamic,
         mediaPlayerModel,
         playOnceInitialized,
         lastLivePlaybackTime,
         availabilityStartTime,
-        compatibleWithPreviousStream,
+        seekTarget,
         isLowLatencySeekingInProgress,
         playbackStalled,
         minPlaybackRateChange,
@@ -73,14 +72,14 @@ function PlaybackController() {
         reset();
     }
 
-    function initialize(StreamInfo, compatible) {
+    function initialize(StreamInfo, periodSwitch, seekTime) {
         streamInfo = StreamInfo;
         addAllListeners();
         isDynamic = streamInfo.manifestInfo.isDynamic;
         isLowLatencySeekingInProgress = false;
         playbackStalled = false;
-        liveStartTime = streamInfo.start;
-        compatibleWithPreviousStream = compatible;
+        streamSwitch = periodSwitch === true;
+        streamSeekTime = seekTime;
 
         const ua = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase() : '';
 
@@ -88,11 +87,10 @@ function PlaybackController() {
         const isSafari = /safari/.test(ua) && !/chrome/.test(ua);
         minPlaybackRateChange = isSafari ? 0.25 : 0.02;
 
+        eventBus.on(Events.STREAM_INITIALIZED, onStreamInitialized, this);
         eventBus.on(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, this);
-        eventBus.on(Events.BYTES_APPENDED_END_FRAGMENT, onBytesAppended, this);
         eventBus.on(Events.LOADING_PROGRESS, onFragmentLoadProgress, this);
         eventBus.on(Events.BUFFER_LEVEL_STATE_CHANGED, onBufferLevelStateChanged, this);
-        eventBus.on(Events.PERIOD_SWITCH_STARTED, onPeriodSwitchStarted, this);
         eventBus.on(Events.PLAYBACK_PROGRESS, onPlaybackProgression, this);
         eventBus.on(Events.PLAYBACK_TIME_UPDATED, onPlaybackProgression, this);
         eventBus.on(Events.PLAYBACK_ENDED, onPlaybackEnded, this);
@@ -104,10 +102,49 @@ function PlaybackController() {
         }
     }
 
-    function onPeriodSwitchStarted(e) {
-        if (!isDynamic && e.fromStreamInfo && earliestTime[e.fromStreamInfo.id] !== undefined) {
-            delete bufferedRange[e.fromStreamInfo.id];
-            delete earliestTime[e.fromStreamInfo.id];
+    function onStreamInitialized(e) {
+        // Seamless period switch
+        if (streamSwitch && isNaN(streamSeekTime)) return;
+
+        // Seek new stream in priority order:
+        // - at seek time (streamSeekTime) when switching period
+        // - at start time provided in URI parameters
+        // - at stream/period start time (for static streams) or live start time (for dynamic streams)
+        let startTime = streamSeekTime;
+        if (isNaN(startTime)) {
+            if (isDynamic) {
+                // For dynamic stream, start by default at (live edge - live delay)
+                startTime = e.liveStartTime;
+                // If start time in URI, take min value between live edge time and time from URI (capped by DVR window range)
+                const dvrInfo = dashMetrics.getCurrentDVRInfo();
+                const dvrWindow = dvrInfo ? dvrInfo.range : null;
+                if (dvrWindow) {
+                    // #t shall be relative to period start
+                    const startTimeFromUri = getStartTimeFromUriParameters(streamInfo.start, true);
+                    if (!isNaN(startTimeFromUri)) {
+                        logger.info('Start time from URI parameters: ' + startTimeFromUri);
+                        startTime = Math.max(Math.min(startTime, startTimeFromUri), dvrWindow.start);
+                    }
+                }
+            } else {
+                // For static stream, start by default at period start
+                startTime = streamInfo.start;
+                // If start time in URI, take max value between period start and time from URI (if in period range)
+                const startTimeFromUri = getStartTimeFromUriParameters(streamInfo.start, false);
+                if (!isNaN(startTimeFromUri) && startTimeFromUri < (startTime + streamInfo.duration)) {
+                    logger.info('Start time from URI parameters: ' + startTimeFromUri);
+                    startTime = Math.max(startTime, startTimeFromUri);
+                }
+            }
+        }
+
+        if (!isNaN(startTime) && startTime !== videoModel.getTime()) {
+            // Trigger PLAYBACK_SEEKING event for controllers
+            eventBus.trigger(Events.PLAYBACK_SEEKING, {
+                seekTime: startTime
+            });
+            // Seek video model
+            seek(startTime, false, true);
         }
     }
 
@@ -116,9 +153,7 @@ function PlaybackController() {
     }
 
     function getStreamEndTime() {
-        const startTime = getStreamStartTime(true);
-        const offset = isDynamic && streamInfo ? startTime - streamInfo.start : 0;
-        return startTime + (streamInfo ? streamInfo.duration - offset : offset);
+        return streamInfo.start + streamInfo.duration;
     }
 
     function play() {
@@ -144,24 +179,22 @@ function PlaybackController() {
     }
 
     function seek(time, stickToBuffered, internalSeek) {
-        if (streamInfo && videoModel) {
-            if (internalSeek === true) {
-                if (time !== videoModel.getTime()) {
-                    // Internal seek = seek video model only (disable 'seeking' listener),
-                    // buffer(s) are already appended at given time (see onBytesAppended())
-                    videoModel.removeEventListener('seeking', onPlaybackSeeking);
-                    logger.info('Requesting internal seek to time: ' + time);
-                    videoModel.setCurrentTime(time, stickToBuffered);
-                }
-            } else {
-                eventBus.trigger(Events.PLAYBACK_SEEK_ASKED);
-                if (streamInfo) {
-                    delete bufferedRange[streamInfo.id];
-                    delete earliestTime[streamInfo.id];
-                }
-                logger.info('Requesting seek to time: ' + time);
-                videoModel.setCurrentTime(time, stickToBuffered);
-            }
+        if (!streamInfo || !videoModel) return;
+
+        let currentTime = !isNaN(seekTarget) ? seekTarget : videoModel.getTime();
+        if (time === currentTime) return;
+
+        if (internalSeek === true) {
+            // Internal seek = seek video model only (disable 'seeking' listener)
+            // buffer(s) are already appended at requested time
+            videoModel.removeEventListener('seeking', onPlaybackSeeking);
+            logger.info('Requesting internal seek to time: ' + time);
+            videoModel.setCurrentTime(time, stickToBuffered);
+        } else {
+            seekTarget = time;
+            eventBus.trigger(Events.PLAYBACK_SEEK_ASKED);
+            logger.info('Requesting seek to time: ' + time);
+            videoModel.setCurrentTime(time, stickToBuffered);
         }
     }
 
@@ -209,14 +242,6 @@ function PlaybackController() {
         return streamController;
     }
 
-    function setLiveStartTime(value) {
-        liveStartTime = value;
-    }
-
-    function getLiveStartTime() {
-        return liveStartTime;
-    }
-
     /**
      * Computes the desirable delay for the live edge to avoid a risk of getting 404 when playing at the bleeding edge
      * @param {number} fragmentDuration - seconds?
@@ -225,20 +250,14 @@ function PlaybackController() {
      * @returns {number} object
      * @memberof PlaybackController#
      */
-    function computeLiveDelay(fragmentDuration, dvrWindowSize, minBufferTime = NaN) {
+    function computeAndSetLiveDelay(fragmentDuration, dvrWindowSize, minBufferTime) {
         let delay,
             ret,
-            r,
             startTime;
         const END_OF_PLAYLIST_PADDING = 10;
         const MIN_BUFFER_TIME_FACTOR = 4;
         const FRAGMENT_DURATION_FACTOR = 4;
-
-        let uriParameters = uriFragmentModel.getURIFragmentData();
-
-        if (uriParameters) {
-            r = parseInt(uriParameters.r, 10);
-        }
+        const adjustedFragmentDuration = !isNaN(fragmentDuration) && isFinite(fragmentDuration) ? fragmentDuration : NaN;
 
         let suggestedPresentationDelay = adapter.getSuggestedPresentationDelay();
 
@@ -246,14 +265,12 @@ function PlaybackController() {
             delay = 0;
         } else if (mediaPlayerModel.getLiveDelay()) {
             delay = mediaPlayerModel.getLiveDelay(); // If set by user, this value takes precedence
-        } else if (settings.get().streaming.liveDelayFragmentCount !== null && !isNaN(settings.get().streaming.liveDelayFragmentCount) && !isNaN(fragmentDuration)) {
-            delay = fragmentDuration * settings.get().streaming.liveDelayFragmentCount;
-        } else if (r) {
-            delay = r;
+        } else if (settings.get().streaming.liveDelayFragmentCount !== null && !isNaN(settings.get().streaming.liveDelayFragmentCount) && !isNaN(adjustedFragmentDuration)) {
+            delay = adjustedFragmentDuration * settings.get().streaming.liveDelayFragmentCount;
         } else if (settings.get().streaming.useSuggestedPresentationDelay === true && suggestedPresentationDelay !== null && !isNaN(suggestedPresentationDelay) && suggestedPresentationDelay > 0) {
             delay = suggestedPresentationDelay;
-        } else if (!isNaN(fragmentDuration)) {
-            delay = fragmentDuration * FRAGMENT_DURATION_FACTOR;
+        } else if (!isNaN(adjustedFragmentDuration)) {
+            delay = adjustedFragmentDuration * FRAGMENT_DURATION_FACTOR;
         } else {
             delay = !isNaN(minBufferTime) ? minBufferTime * MIN_BUFFER_TIME_FACTOR : streamInfo.manifestInfo.minBufferTime * MIN_BUFFER_TIME_FACTOR;
         }
@@ -281,6 +298,14 @@ function PlaybackController() {
         return liveDelay;
     }
 
+    function setLiveDelay(value, useMaxValue = false) {
+        if (useMaxValue && value < liveDelay) {
+            return;
+        }
+
+        liveDelay = value;
+    }
+
     function getCurrentLiveLatency() {
         if (!isDynamic || isNaN(availabilityStartTime)) {
             return NaN;
@@ -295,18 +320,17 @@ function PlaybackController() {
     }
 
     function reset() {
-        liveStartTime = NaN;
         playOnceInitialized = false;
-        earliestTime = {};
+        streamSwitch = false;
+        streamSeekTime = NaN;
         liveDelay = 0;
         availabilityStartTime = 0;
-        bufferedRange = {};
+        seekTarget = NaN;
         if (videoModel) {
+            eventBus.off(Events.STREAM_INITIALIZED, onStreamInitialized, this);
             eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, this);
             eventBus.off(Events.BUFFER_LEVEL_STATE_CHANGED, onBufferLevelStateChanged, this);
-            eventBus.off(Events.BYTES_APPENDED_END_FRAGMENT, onBytesAppended, this);
             eventBus.off(Events.LOADING_PROGRESS, onFragmentLoadProgress, this);
-            eventBus.off(Events.PERIOD_SWITCH_STARTED, onPeriodSwitchStarted, this);
             eventBus.off(Events.PLAYBACK_PROGRESS, onPlaybackProgression, this);
             eventBus.off(Events.PLAYBACK_TIME_UPDATED, onPlaybackProgression, this);
             eventBus.off(Events.PLAYBACK_ENDED, onPlaybackEnded, this);
@@ -349,65 +373,23 @@ function PlaybackController() {
         }
     }
 
-    function getStartTimeFromUriParameters() {
+    function getStartTimeFromUriParameters(rangeStart, isDynamic) {
         const fragData = uriFragmentModel.getURIFragmentData();
-        let uriParameters;
-        if (fragData) {
-            uriParameters = {};
-            const r = parseInt(fragData.r, 10);
-            if (r >= 0 && streamInfo && r < streamInfo.manifestInfo.DVRWindowSize && fragData.t === null) {
-                fragData.t = Math.max(Math.floor(Date.now() / 1000) - streamInfo.manifestInfo.DVRWindowSize, (streamInfo.manifestInfo.availableFrom.getTime() / 1000) + streamInfo.start) + r;
-            }
-            uriParameters.fragS = parseFloat(fragData.s);
-            uriParameters.fragT = parseFloat(fragData.t);
+        if (!fragData || !fragData.t) {
+            return NaN;
         }
-        return uriParameters;
-    }
 
-    /**
-     * @param {boolean} ignoreStartOffset - ignore URL fragment start offset if true
-     * @param {number} liveEdge - liveEdge value
-     * @returns {number} object
-     * @memberof PlaybackController#
-     */
-    function getStreamStartTime(ignoreStartOffset, liveEdge) {
-        let presentationStartTime;
-        let startTimeOffset = NaN;
-
-        if (!ignoreStartOffset) {
-            const uriParameters = getStartTimeFromUriParameters();
-            if (uriParameters) {
-                startTimeOffset = !isNaN(uriParameters.fragS) ? uriParameters.fragS : uriParameters.fragT;
-            } else {
-                startTimeOffset = 0;
-            }
-        } else {
-            startTimeOffset = streamInfo ? streamInfo.start : startTimeOffset;
-        }
+        let startTime = NaN;
 
-        if (isDynamic) {
-            if (!isNaN(startTimeOffset) && streamInfo) {
-                presentationStartTime = startTimeOffset - (streamInfo.manifestInfo.availableFrom.getTime() / 1000);
+        // Consider only start time of MediaRange
+        // TODO: consider end time of MediaRange to stop playback at provided end time
+        fragData.t = fragData.t.split(',')[0];
 
-                if (presentationStartTime > liveStartTime ||
-                    presentationStartTime < (!isNaN(liveEdge) ? (liveEdge - streamInfo.manifestInfo.DVRWindowSize) : NaN)) {
-                    presentationStartTime = null;
-                }
-            }
-            presentationStartTime = presentationStartTime || liveStartTime;
-
-        } else {
-            if (streamInfo) {
-                if (!isNaN(startTimeOffset) && startTimeOffset < Math.max(streamInfo.manifestInfo.duration, streamInfo.duration) && startTimeOffset >= 0) {
-                    presentationStartTime = startTimeOffset;
-                } else {
-                    let currentEarliestTime = earliestTime[streamInfo.id]; //set by ready bufferStart after first onBytesAppended
-                    presentationStartTime = currentEarliestTime !== undefined ? Math.max(currentEarliestTime.audio !== undefined ? currentEarliestTime.audio : 0, currentEarliestTime.video !== undefined ? currentEarliestTime.video : 0, streamInfo.start) : streamInfo.start;
-                }
-            }
-        }
+        // "t=<time>" : time is relative to period start (for static streams) or DVR window range start (for dynamic streams)
+        // "t=posix:<time>" : time is absolute start time as number of seconds since 01-01-1970
+        startTime = (isDynamic && fragData.t.indexOf('posix:') !== -1) ? parseInt(fragData.t.substring(6)) : (rangeStart + parseInt(fragData.t));
 
-        return presentationStartTime;
+        return startTime;
     }
 
     function getActualPresentationTime(currentTime) {
@@ -508,7 +490,15 @@ function PlaybackController() {
     }
 
     function onPlaybackSeeking() {
-        const seekTime = getTime();
+        let seekTime = getTime();
+
+        // On some browsers/devices, in case of live streams, setting current time on video element fails when there is no buffered data at requested time
+        // Then re-set seek target time and video element will be seeked afterwhile once data is buffered (see BufferContoller)
+        if (!isNaN(seekTarget) && seekTarget !== seekTime) {
+            seekTime = seekTarget;
+        }
+        seekTarget = NaN;
+
         logger.info('Seeking to: ' + seekTime);
         startUpdatingWallclockTime();
         eventBus.trigger(Events.PLAYBACK_SEEKING, {
@@ -597,17 +587,6 @@ function PlaybackController() {
         }
     }
 
-    function checkTimeInRanges(time, ranges) {
-        if (ranges && ranges.length > 0) {
-            for (let i = 0, len = ranges.length; i < len; i++) {
-                if (time >= ranges.start(i) && time < ranges.end(i)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
     function onPlaybackProgression() {
         if (
             isDynamic &&
@@ -639,8 +618,12 @@ function PlaybackController() {
     }
 
     function needToCatchUp() {
-        return settings.get().streaming.liveCatchUpPlaybackRate > 0 && getTime() > 0 &&
-            Math.abs(getCurrentLiveLatency() - mediaPlayerModel.getLiveDelay()) > settings.get().streaming.liveCatchUpMinDrift;
+        const currentLiveLatency = getCurrentLiveLatency();
+        const latencyDrift = Math.abs(currentLiveLatency - mediaPlayerModel.getLiveDelay());
+        const liveCatchupLatencyThreshold = mediaPlayerModel.getLiveCatchupLatencyThreshold();
+
+        return settings.get().streaming.lowLatencyEnabled && settings.get().streaming.liveCatchUpPlaybackRate > 0 && getTime() > 0 &&
+            latencyDrift > settings.get().streaming.liveCatchUpMinDrift && (isNaN(liveCatchupLatencyThreshold) || currentLiveLatency <= liveCatchupLatencyThreshold);
     }
 
     function startPlaybackCatchUp() {
@@ -687,75 +670,6 @@ function PlaybackController() {
         }
     }
 
-    function onBytesAppended(e) {
-        let commonEarliestTime,
-            initialStartTime;
-        let ranges = e.bufferedRanges;
-        if (!ranges || !ranges.length) return;
-        if (earliestTime[streamInfo.id] && earliestTime[streamInfo.id].started === true) {
-            //stream has already been started.
-            return;
-        }
-
-        const type = e.sender.getType();
-
-        if (bufferedRange[streamInfo.id] === undefined) {
-            bufferedRange[streamInfo.id] = [];
-        }
-
-        bufferedRange[streamInfo.id][type] = ranges;
-
-        if (earliestTime[streamInfo.id] === undefined) {
-            earliestTime[streamInfo.id] = [];
-            earliestTime[streamInfo.id].started = false;
-        }
-
-        if (earliestTime[streamInfo.id][type] === undefined) {
-            earliestTime[streamInfo.id][type] = Math.max(ranges.start(0), streamInfo.start);
-        }
-
-        const hasVideoTrack = streamController.isTrackTypePresent(Constants.VIDEO);
-        const hasAudioTrack = streamController.isTrackTypePresent(Constants.AUDIO);
-
-        initialStartTime = getStreamStartTime(false);
-        if (hasAudioTrack && hasVideoTrack) {
-            //current stream has audio and video contents
-            if (!isNaN(earliestTime[streamInfo.id].audio) && !isNaN(earliestTime[streamInfo.id].video)) {
-
-                if (earliestTime[streamInfo.id].audio < earliestTime[streamInfo.id].video) {
-                    // common earliest is video time
-                    // check buffered audio range has video time, if ok, we seek, otherwise, we wait some other data
-                    commonEarliestTime = earliestTime[streamInfo.id].video > initialStartTime ? earliestTime[streamInfo.id].video : initialStartTime;
-                    ranges = bufferedRange[streamInfo.id].audio;
-                } else {
-                    // common earliest is audio time
-                    // check buffered video range has audio time, if ok, we seek, otherwise, we wait some other data
-                    commonEarliestTime = earliestTime[streamInfo.id].audio > initialStartTime ? earliestTime[streamInfo.id].audio : initialStartTime;
-                    ranges = bufferedRange[streamInfo.id].video;
-                }
-                if (checkTimeInRanges(commonEarliestTime, ranges)) {
-                    if (!(checkTimeInRanges(getNormalizedTime(), bufferedRange[streamInfo.id].audio) && checkTimeInRanges(getNormalizedTime(), bufferedRange[streamInfo.id].video))) {
-                        if (!compatibleWithPreviousStream && commonEarliestTime !== 0) {
-                            seek(commonEarliestTime, true, true);
-                        }
-                    }
-                    earliestTime[streamInfo.id].started = true;
-                }
-            }
-        } else {
-            //current stream has only audio or only video content
-            if (earliestTime[streamInfo.id][type]) {
-                commonEarliestTime = earliestTime[streamInfo.id][type] > initialStartTime ? earliestTime[streamInfo.id][type] : initialStartTime;
-                if (!checkTimeInRanges(getNormalizedTime(), bufferedRange[streamInfo.id][type])) {
-                    if (!compatibleWithPreviousStream) {
-                        seek(commonEarliestTime, false, true);
-                    }
-                }
-                earliestTime[streamInfo.id].started = true;
-            }
-        }
-    }
-
     function onFragmentLoadProgress(e) {
         // If using fetch and stream mode is not available, readjust live latency so it is 20% higher than segment duration
         if (e.stream === false && settings.get().streaming.lowLatencyEnabled && !isNaN(e.request.duration)) {
@@ -770,7 +684,7 @@ function PlaybackController() {
 
     function onBufferLevelStateChanged(e) {
         // do not stall playback when get an event from Stream that is not active
-        if (e.streamInfo.id !== streamInfo.id) return;
+        if (e.streamId !== streamInfo.id) return;
 
         if (settings.get().streaming.lowLatencyEnabled) {
             if (e.state === MetricsConstants.BUFFER_EMPTY && !isSeeking()) {
@@ -872,7 +786,6 @@ function PlaybackController() {
         initialize: initialize,
         setConfig: setConfig,
         getStartTimeFromUriParameters: getStartTimeFromUriParameters,
-        getStreamStartTime: getStreamStartTime,
         getTimeToStreamEnd: getTimeToStreamEnd,
         getTime: getTime,
         getNormalizedTime: getNormalizedTime,
@@ -881,10 +794,9 @@ function PlaybackController() {
         getEnded: getEnded,
         getIsDynamic: getIsDynamic,
         getStreamController: getStreamController,
-        setLiveStartTime: setLiveStartTime,
-        getLiveStartTime: getLiveStartTime,
-        computeLiveDelay: computeLiveDelay,
+        computeAndSetLiveDelay: computeAndSetLiveDelay,
         getLiveDelay: getLiveDelay,
+        setLiveDelay: setLiveDelay,
         getCurrentLiveLatency: getCurrentLiveLatency,
         play: play,
         isPaused: isPaused,
diff --git a/src/streaming/controllers/ScheduleController.js b/src/streaming/controllers/ScheduleController.js
index 2e4c1a02b5..5108e82000 100644
--- a/src/streaming/controllers/ScheduleController.js
+++ b/src/streaming/controllers/ScheduleController.js
@@ -30,16 +30,13 @@
  */
 import Constants from '../constants/Constants';
 import MetricsConstants from '../constants/MetricsConstants';
-import {PlayListTrace} from '../vo/metrics/PlayList';
 import BufferLevelRule from '../rules/scheduling/BufferLevelRule';
-import NextFragmentRequestRule from '../rules/scheduling/NextFragmentRequestRule';
 import FragmentModel from '../models/FragmentModel';
 import EventBus from '../../core/EventBus';
 import Events from '../../core/events/Events';
 import FactoryMaker from '../../core/FactoryMaker';
 import Debug from '../../core/Debug';
 import MediaController from './MediaController';
-import LiveEdgeFinder from '../utils/LiveEdgeFinder';
 
 function ScheduleController(config) {
 
@@ -48,17 +45,16 @@ function ScheduleController(config) {
     const eventBus = EventBus(context).getInstance();
     const adapter = config.adapter;
     const dashMetrics = config.dashMetrics;
-    const timelineConverter = config.timelineConverter;
     const mediaPlayerModel = config.mediaPlayerModel;
     const fragmentModel = config.fragmentModel;
     const abrController = config.abrController;
     const playbackController = config.playbackController;
-    const streamController = config.streamController;
     const textController = config.textController;
     const streamId = config.streamId;
     const type = config.type;
-    const streamProcessor = config.streamProcessor;
+    const mimeType = config.mimeType;
     const mediaController = config.mediaController;
+    const bufferController = config.bufferController;
     const settings = config.settings;
 
     let instance,
@@ -70,30 +66,26 @@ function ScheduleController(config) {
         timeToLoadDelay,
         scheduleTimeout,
         seekTarget,
+        hasVideoTrack,
         bufferLevelRule,
-        nextFragmentRequestRule,
         lastFragmentRequest,
         topQualityIndex,
         lastInitQuality,
         replaceRequestArray,
         switchTrack,
-        bufferResetInProgress,
+        replacingBuffer,
         mediaRequest,
-        liveEdgeFinder,
         checkPlaybackQuality,
         isReplacementRequest;
 
     function setup() {
         logger = Debug(context).getInstance().getLogger(instance);
-        if (playbackController && playbackController.getIsDynamic()) {
-            liveEdgeFinder = LiveEdgeFinder(context).create({
-                timelineConverter: timelineConverter
-            });
-        }
         resetInitialSettings();
     }
 
-    function initialize() {
+    function initialize(_hasVideoTrack) {
+        hasVideoTrack = _hasVideoTrack;
+
         bufferLevelRule = BufferLevelRule(context).create({
             abrController: abrController,
             dashMetrics: dashMetrics,
@@ -102,26 +94,12 @@ function ScheduleController(config) {
             settings: settings
         });
 
-        nextFragmentRequestRule = NextFragmentRequestRule(context).create({
-            textController: textController,
-            playbackController: playbackController
-        });
-
-        if (adapter.getIsTextTrack(config.mimeType)) {
-            eventBus.on(Events.TIMED_TEXT_REQUESTED, onTimedTextRequested, this);
-        }
-
         //eventBus.on(Events.LIVE_EDGE_SEARCH_COMPLETED, onLiveEdgeSearchCompleted, this);
-        eventBus.on(Events.QUALITY_CHANGE_REQUESTED, onQualityChanged, this);
         eventBus.on(Events.DATA_UPDATE_STARTED, onDataUpdateStarted, this);
-        eventBus.on(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, this);
         eventBus.on(Events.FRAGMENT_LOADING_COMPLETED, onFragmentLoadingCompleted, this);
         eventBus.on(Events.STREAM_COMPLETED, onStreamCompleted, this);
-        eventBus.on(Events.STREAM_INITIALIZED, onStreamInitialized, this);
-        eventBus.on(Events.BUFFER_LEVEL_STATE_CHANGED, onBufferLevelStateChanged, this);
         eventBus.on(Events.BUFFER_CLEARED, onBufferCleared, this);
         eventBus.on(Events.BYTES_APPENDED_END_FRAGMENT, onBytesAppended, this);
-        eventBus.on(Events.INIT_REQUESTED, onInitRequested, this);
         eventBus.on(Events.QUOTA_EXCEEDED, onQuotaExceeded, this);
         eventBus.on(Events.PLAYBACK_SEEKING, onPlaybackSeeking, this);
         eventBus.on(Events.PLAYBACK_STARTED, onPlaybackStarted, this);
@@ -129,6 +107,11 @@ function ScheduleController(config) {
         eventBus.on(Events.PLAYBACK_TIME_UPDATED, onPlaybackTimeUpdated, this);
         eventBus.on(Events.URL_RESOLUTION_FAILED, onURLResolutionFailed, this);
         eventBus.on(Events.FRAGMENT_LOADING_ABANDONED, onFragmentLoadingAbandoned, this);
+        eventBus.on(Events.BUFFERING_COMPLETED, onBufferingCompleted, this);
+    }
+
+    function setCurrentRepresentation(representationInfo) {
+        currentRepresentationInfo = representationInfo;
     }
 
     function isStarted() {
@@ -136,13 +119,12 @@ function ScheduleController(config) {
     }
 
     function start() {
-        if (!currentRepresentationInfo || streamProcessor.isBufferingCompleted()) {
-            logger.warn('Start denied to Schedule Controller');
-            return;
-        }
+        if (isStarted()) return;
+        if (!currentRepresentationInfo || bufferController.getIsBufferingCompleted()) return;
+
         logger.debug('Schedule Controller starts');
-        createPlaylistTraceMetrics();
         isStopped = false;
+        dashMetrics.createPlaylistTraceMetrics(currentRepresentationInfo.id, playbackController.getTime() * 1000, playbackController.getPlaybackRate());
 
         if (initialRequest) {
             initialRequest = false;
@@ -152,9 +134,8 @@ function ScheduleController(config) {
     }
 
     function stop() {
-        if (isStopped) {
-            return;
-        }
+        if (isStopped) return;
+
         logger.debug('Schedule Controller stops');
         isStopped = true;
         clearTimeout(scheduleTimeout);
@@ -174,38 +155,39 @@ function ScheduleController(config) {
     }
 
     function schedule() {
-        const bufferController = streamProcessor.getBufferController();
-        if (isStopped || isFragmentProcessingInProgress || !bufferController ||
+        if (isStopped || isFragmentProcessingInProgress ||
             (playbackController.isPaused() && !settings.get().streaming.scheduleWhilePaused) ||
-            ((type === Constants.FRAGMENTED_TEXT || type === Constants.TEXT) && !textController.isTextEnabled())) {
-            logger.debug('Schedule stop!');
-            return;
-        }
-
-        if (bufferController.getIsBufferingCompleted()) {
-            logger.debug('Schedule stop because buffering is completed!');
+            ((type === Constants.FRAGMENTED_TEXT || type === Constants.TEXT) && !textController.isTextEnabled()) ||
+            bufferController.getIsBufferingCompleted()) {
+            stop();
             return;
         }
 
         validateExecutedFragmentRequest();
 
         const isReplacement = replaceRequestArray.length > 0;
-        const streamInfo = streamProcessor.getStreamInfo();
-        if (bufferResetInProgress || isNaN(lastInitQuality) || switchTrack || isReplacement ||
-            hasTopQualityChanged(currentRepresentationInfo.mediaInfo.type, streamInfo.id) ||
-            bufferLevelRule.execute(streamProcessor, streamController.isTrackTypePresent(Constants.VIDEO))) {
+        if (replacingBuffer || isNaN(lastInitQuality) || switchTrack || isReplacement ||
+            hasTopQualityChanged(type, streamId) ||
+            bufferLevelRule.execute(type, currentRepresentationInfo, hasVideoTrack)) {
 
             const getNextFragment = function () {
-                if ((currentRepresentationInfo.quality !== lastInitQuality || switchTrack) && (!bufferResetInProgress)) {
-                    logger.debug('Quality has changed, get init request for representationid = ' + currentRepresentationInfo.id);
+                if ((currentRepresentationInfo.quality !== lastInitQuality || switchTrack) && (!replacingBuffer)) {
                     if (switchTrack) {
-                        bufferResetInProgress = mediaController.getSwitchMode(type) === MediaController.TRACK_SWITCH_MODE_ALWAYS_REPLACE ? true : false;
-                        logger.debug('Switch track has been asked, get init request for ' + type + ' with representationid = ' + currentRepresentationInfo.id + 'bufferResetInProgress = ' + bufferResetInProgress);
-                        streamProcessor.switchInitData(currentRepresentationInfo.id, bufferResetInProgress);
+                        logger.debug('Switch track for ' + type + ', representation id = ' + currentRepresentationInfo.id);
+                        replacingBuffer = mediaController.getSwitchMode(type) === MediaController.TRACK_SWITCH_MODE_ALWAYS_REPLACE;
+                        if (replacingBuffer && bufferController.replaceBuffer) {
+                            bufferController.replaceBuffer();
+                        }
                         switchTrack = false;
                     } else {
-                        streamProcessor.switchInitData(currentRepresentationInfo.id);
+                        logger.debug('Quality has changed, get init request for representationid = ' + currentRepresentationInfo.id);
                     }
+                    eventBus.trigger(Events.INIT_FRAGMENT_NEEDED, {
+                        sender: instance,
+                        streamId: streamId,
+                        mediaType: type,
+                        representationId: currentRepresentationInfo.id
+                    });
                     lastInitQuality = currentRepresentationInfo.quality;
                     checkPlaybackQuality = false;
                 } else {
@@ -213,33 +195,21 @@ function ScheduleController(config) {
 
                     if (replacement && replacement.isInitializationRequest()) {
                         // To be sure the specific init segment had not already been loaded
-                        streamProcessor.switchInitData(replacement.representationId);
+                        eventBus.trigger(Events.INIT_FRAGMENT_NEEDED, {
+                            sender: instance,
+                            streamId: streamId,
+                            mediaType: type,
+                            representationId: replacement.representationId
+                        });
                         checkPlaybackQuality = false;
                     } else {
-                        let request;
-                        // Don't schedule next fragments while pruning to avoid buffer inconsistencies
-                        if (!streamProcessor.getBufferController().getIsPruningInProgress()) {
-                            request = nextFragmentRequestRule.execute(streamProcessor, seekTarget, replacement);
-                            setSeekTarget(NaN);
-                            if (request && !replacement) {
-                                if (!isNaN(request.startTime + request.duration)) {
-                                    streamProcessor.setIndexHandlerTime(request.startTime + request.duration);
-                                }
-                                request.delayLoadingTime = new Date().getTime() + timeToLoadDelay;
-                                setTimeToLoadDelay(0);
-                            }
-                            if (!request && streamInfo.manifestInfo && streamInfo.manifestInfo.isDynamic) {
-                                logger.debug('Next fragment seems to be at the bleeding live edge and is not available yet. Rescheduling.');
-                            }
-                        }
-
-                        if (request) {
-                            logger.debug('Next fragment request url is ' + request.url);
-                            fragmentModel.executeRequest(request);
-                        } else { // Use case - Playing at the bleeding live edge and frag is not available yet. Cycle back around.
-                            setFragmentProcessState(false);
-                            startScheduleTimer(settings.get().streaming.lowLatencyEnabled ? 100 : 500);
-                        }
+                        eventBus.trigger(Events.MEDIA_FRAGMENT_NEEDED, {
+                            sender: instance,
+                            streamId: streamId,
+                            mediaType: type,
+                            seekTarget: seekTarget,
+                            replacement: replacement
+                        });
                         checkPlaybackQuality = true;
                     }
                 }
@@ -275,9 +245,9 @@ function ScheduleController(config) {
             threshold: 0
         })[0];
 
-        if (request && replaceRequestArray.indexOf(request) === -1 && !adapter.getIsTextTrack(type)) {
+        if (request && replaceRequestArray.indexOf(request) === -1 && !adapter.getIsTextTrack(mimeType)) {
             const fastSwitchModeEnabled = settings.get().streaming.fastSwitchEnabled;
-            const bufferLevel = streamProcessor.getBufferLevel();
+            const bufferLevel = bufferController.getBufferLevel();
             const abandonmentState = abrController.getAbandonmentStateFor(type);
 
             // Only replace on track switch when NEVER_REPLACE
@@ -288,7 +258,7 @@ function ScheduleController(config) {
                 replaceRequest(request);
                 isReplacementRequest = true;
                 logger.debug('Reloading outdated fragment at index: ', request.index);
-            } else if (request.quality > currentRepresentationInfo.quality && !bufferResetInProgress) {
+            } else if (request.quality > currentRepresentationInfo.quality && !replacingBuffer) {
                 // The buffer has better quality it in then what we would request so set append point to end of buffer!!
                 setSeekTarget(playbackController.getTime() + bufferLevel);
             }
@@ -301,30 +271,34 @@ function ScheduleController(config) {
         scheduleTimeout = setTimeout(schedule, value);
     }
 
-    function onInitRequested(e) {
-        if (!e.sender || e.sender.getStreamProcessor() !== streamProcessor) {
-            return;
-        }
-
-        getInitRequest(currentRepresentationInfo.quality);
-    }
-
-    function setFragmentProcessState(state) {
-        if (isFragmentProcessingInProgress !== state) {
+    function setFragmentProcessState (state) {
+        if (isFragmentProcessingInProgress !== state ) {
             isFragmentProcessingInProgress = state;
         } else {
             logger.debug('isFragmentProcessingInProgress is already equal to', state);
         }
     }
 
-    function getInitRequest(quality) {
-        const request = streamProcessor.getInitRequest(quality);
+    function processInitRequest(request) {
         if (request) {
             setFragmentProcessState(true);
             fragmentModel.executeRequest(request);
         }
     }
 
+    function processMediaRequest(request) {
+        if (request) {
+            logger.debug('Next fragment request url is ' + request.url);
+            fragmentModel.executeRequest(request);
+        } else { // Use case - Playing at the bleeding live edge and frag is not available yet. Cycle back around.
+            if (playbackController.getIsDynamic()) {
+                logger.debug('Next fragment seems to be at the bleeding live edge and is not available yet. Rescheduling.');
+            }
+            setFragmentProcessState(false);
+            startScheduleTimer(settings.get().streaming.lowLatencyEnabled ? 100 : 500);
+        }
+    }
+
     function switchTrackAsked() {
         switchTrack = true;
     }
@@ -333,21 +307,6 @@ function ScheduleController(config) {
         replaceRequestArray.push(request);
     }
 
-    function onQualityChanged(e) {
-        if (type !== e.mediaType || streamProcessor.getStreamInfo().id !== e.streamInfo.id) {
-            return;
-        }
-
-        currentRepresentationInfo = streamProcessor.getRepresentationInfo(e.newQuality);
-
-        if (currentRepresentationInfo === null || currentRepresentationInfo === undefined) {
-            throw new Error('Unexpected error! - currentRepresentationInfo is null or undefined');
-        }
-
-        clearPlayListTraceMetrics(new Date(), PlayListTrace.REPRESENTATION_SWITCH_STOP_REASON);
-        createPlaylistTraceMetrics();
-    }
-
     function completeQualityChange(trigger) {
         if (playbackController && fragmentModel) {
             const item = fragmentModel.getRequests({
@@ -379,100 +338,6 @@ function ScheduleController(config) {
         }
     }
 
-    function onDataUpdateCompleted(e) {
-        if (e.error || e.sender.getType() !== streamProcessor.getType()) {
-            return;
-        }
-
-        currentRepresentationInfo = adapter.convertDataToRepresentationInfo(e.currentRepresentation);
-    }
-
-    function onStreamInitialized(e) {
-        if (!e.streamInfo || streamProcessor.getStreamInfo().id !== e.streamInfo.id) {
-            return;
-        }
-
-        currentRepresentationInfo = streamProcessor.getRepresentationInfo();
-
-        if (initialRequest) {
-            if (playbackController.getIsDynamic()) {
-                timelineConverter.setTimeSyncCompleted(true);
-                setLiveEdgeSeekTarget();
-            } else {
-                setSeekTarget(playbackController.getStreamStartTime(false));
-                const bufferController = streamProcessor.getBufferController();
-                if (bufferController) {
-                    bufferController.setSeekStartTime(seekTarget);
-                }
-            }
-        }
-
-        if (isStopped) {
-            start();
-        }
-    }
-
-    function setLiveEdgeSeekTarget() {
-        if (liveEdgeFinder) {
-            const liveEdge = liveEdgeFinder.getLiveEdge(streamProcessor.getRepresentationInfo());
-            let request = _findRequestForLiveEdge(liveEdge);
-
-            if (request) {
-                // When low latency mode is selected but browser doesn't support fetch
-                // start at the beginning of the segment to avoid consuming the whole buffer
-                if (settings.get().streaming.lowLatencyEnabled) {
-                    const liveStartTime = request.duration < mediaPlayerModel.getLiveDelay() ? request.startTime : request.startTime + request.duration - mediaPlayerModel.getLiveDelay();
-                    playbackController.setLiveStartTime(liveStartTime);
-                } else {
-                    playbackController.setLiveStartTime(request.startTime);
-                }
-            } else {
-                logger.debug('setLiveEdgeSeekTarget : getFragmentRequest returned undefined request object');
-            }
-            setSeekTarget(playbackController.getStreamStartTime(false, liveEdge));
-            streamProcessor.getBufferController().setSeekStartTime(seekTarget);
-
-            //special use case for multi period stream. If the startTime is out of the current period, send a seek command.
-            //in onPlaybackSeeking callback (StreamController), the detection of switch stream is done.
-            if (seekTarget > (currentRepresentationInfo.mediaInfo.streamInfo.start + currentRepresentationInfo.mediaInfo.streamInfo.duration)) {
-                playbackController.seek(seekTarget);
-            }
-
-            dashMetrics.updateManifestUpdateInfo({
-                currentTime: seekTarget,
-                presentationStartTime: liveEdge,
-                latency: liveEdge - seekTarget,
-                clientTimeOffset: timelineConverter.getClientTimeOffset()
-            });
-        }
-    }
-
-    function _findRequestForLiveEdge(liveEdge) {
-        try {
-            let request = null;
-            let liveDelay = playbackController.computeLiveDelay(currentRepresentationInfo.fragmentDuration, currentRepresentationInfo.mediaInfo.streamInfo.manifestInfo.DVRWindowSize);
-            const dvrWindowSize = !isNaN(currentRepresentationInfo.mediaInfo.streamInfo.manifestInfo.DVRWindowSize) ? currentRepresentationInfo.mediaInfo.streamInfo.manifestInfo.DVRWindowSize : liveDelay;
-
-            // Make sure that we have at least a valid request for the end of the DVR window, otherwise we might try forever
-            if (streamProcessor.getFragmentRequest(currentRepresentationInfo, liveEdge - dvrWindowSize, {
-                ignoreIsFinished: true
-            })) {
-                // Try to find a request as close as possible to the targeted live edge
-                while (!request && liveDelay <= dvrWindowSize) {
-                    let startTime = liveEdge - liveDelay;
-                    request = streamProcessor.getFragmentRequest(currentRepresentationInfo, startTime, {
-                        ignoreIsFinished: true
-                    });
-                    liveDelay += 1; // Increase by one second for each iteration
-                }
-            }
-
-            return request;
-        } catch (e) {
-            return null;
-        }
-    }
-
     function onStreamCompleted(e) {
         if (e.request.mediaInfo.streamInfo.id !== streamId || e.request.mediaType !== type) return;
 
@@ -484,9 +349,9 @@ function ScheduleController(config) {
     function onFragmentLoadingCompleted(e) {
         if (e.request.mediaInfo.streamInfo.id !== streamId || e.request.mediaType !== type) return;
 
-        logger.info('OnFragmentLoadingCompleted - Url:', e.request ? e.request.url : 'undefined', e.request.range ?
-            ', Range:' + e.request.range : '');
-        if (adapter.getIsTextTrack(type)) {
+        logger.info('OnFragmentLoadingCompleted - Url:', e.request ? e.request.url : 'undefined', e.request.range ? ', Range:' + e.request.range : '');
+
+        if (adapter.getIsTextTrack(mimeType)) {
             setFragmentProcessState(false);
         }
 
@@ -496,7 +361,7 @@ function ScheduleController(config) {
             startScheduleTimer(0);
         }
 
-        if (bufferResetInProgress) {
+        if (replacingBuffer) {
             mediaRequest = e.request;
         }
     }
@@ -506,12 +371,10 @@ function ScheduleController(config) {
     }
 
     function onBytesAppended(e) {
-        if (e.sender.getStreamProcessor() !== streamProcessor) {
-            return;
-        }
+        if (e.streamId !== streamId || e.mediaType !== type) return;
 
-        if (bufferResetInProgress && !isNaN(e.startTime)) {
-            bufferResetInProgress = false;
+        if (replacingBuffer && !isNaN(e.startTime)) {
+            replacingBuffer = false;
             fragmentModel.addExecutedRequest(mediaRequest);
         }
 
@@ -547,48 +410,25 @@ function ScheduleController(config) {
     }
 
     function onDataUpdateStarted(e) {
-        const streamInfo = streamProcessor.getStreamInfo();
-        const streamInfoId = streamInfo ? streamInfo.id : null;
-        if (e.sender.getType() !== streamProcessor.getType() || e.sender.getStreamId() !== streamInfoId) {
-            return;
-        }
+        if (e.sender.getType() !== type || e.sender.getStreamId() !== streamId) return;
+        // stop();
+    }
 
+    function onBufferingCompleted(e) {
+        if (type !== e.mediaType || streamId !== e.streamId) return;
         stop();
     }
 
     function onBufferCleared(e) {
-        if (e.sender.getStreamProcessor() !== streamProcessor) {
-            return;
-        }
-
-        const streamInfo = streamProcessor.getStreamInfo();
-        if (streamInfo) {
-            if (e.unintended) {
-                // There was an unintended buffer remove, probably creating a gap in the buffer, remove every saved request
-                fragmentModel.removeExecutedRequestsAfterTime(e.from);
-            } else {
-                fragmentModel.syncExecutedRequestsWithBufferedRange(
-                    streamProcessor.getBufferController().getBuffer().getAllBufferRanges(),
-                    streamInfo.duration);
-            }
-        }
+        if (e.streamId !== streamId || e.mediaType !== type) return;
 
         if (e.hasEnoughSpaceToAppend && e.quotaExceeded && isStopped) {
             start();
         }
     }
 
-    function onBufferLevelStateChanged(e) {
-        if ((e.sender.getStreamProcessor() === streamProcessor) && e.state === MetricsConstants.BUFFER_EMPTY && !playbackController.isSeeking()) {
-            logger.info('Buffer is empty! Stalling!');
-            clearPlayListTraceMetrics(new Date(), PlayListTrace.REBUFFERING_REASON);
-        }
-    }
-
     function onQuotaExceeded(e) {
-        if (e.sender.getStreamProcessor() !== streamProcessor) {
-            return;
-        }
+        if (e.streamId !== streamId || e.mediaType !== type) return;
 
         stop();
         setFragmentProcessState(false);
@@ -599,19 +439,6 @@ function ScheduleController(config) {
         stop();
     }
 
-    function onTimedTextRequested(e) {
-        const streamInfo = streamProcessor.getStreamInfo();
-        const streamInfoId = streamInfo ? streamInfo.id : null;
-        if (e.sender.getStreamId() !== streamInfoId) {
-            return;
-        }
-
-        //if subtitles are disabled, do not download subtitles file.
-        if (textController.isTextEnabled()) {
-            getInitRequest(e.index);
-        }
-    }
-
     function onPlaybackStarted() {
         if (isStopped || !settings.get().streaming.scheduleWhilePaused) {
             start();
@@ -631,11 +458,12 @@ function ScheduleController(config) {
             latency: latency
         });
 
-        //if, during the seek command, the scheduleController is waiting : stop waiting, request chunk as soon as possible
         if (!isFragmentProcessingInProgress) {
+            // Restart scheduler if in pending state
             startScheduleTimer(0);
         } else {
-            logger.debug('onPlaybackSeeking, call fragmentModel.abortRequests in order to seek quicker');
+            // Abort current requests
+            logger.debug('Abort requests');
             fragmentModel.abortRequests();
         }
     }
@@ -652,27 +480,20 @@ function ScheduleController(config) {
         timeToLoadDelay = value;
     }
 
+    function getTimeToLoadDelay() {
+        return timeToLoadDelay;
+    }
+
     function getBufferTarget() {
-        return bufferLevelRule.getBufferTarget(streamProcessor, streamController.isTrackTypePresent(Constants.VIDEO));
+        return bufferLevelRule.getBufferTarget(type, currentRepresentationInfo, hasVideoTrack);
     }
 
     function getType() {
         return type;
     }
 
-    function finalisePlayList(time, reason) {
-        clearPlayListTraceMetrics(time, reason);
-    }
-
-    function clearPlayListTraceMetrics(endTime, stopreason) {
-        dashMetrics.pushPlayListTraceMetrics(endTime, stopreason);
-    }
-
-    function createPlaylistTraceMetrics() {
-        if (currentRepresentationInfo) {
-            const playbackRate = playbackController.getPlaybackRate();
-            dashMetrics.createPlaylistTraceMetrics(currentRepresentationInfo.id, playbackController.getTime() * 1000, playbackRate !== null ? playbackRate.toString() : null);
-        }
+    function getStreamId() {
+        return streamId;
     }
 
     function resetInitialSettings() {
@@ -691,7 +512,7 @@ function ScheduleController(config) {
         replaceRequestArray = [];
         isStopped = true;
         switchTrack = false;
-        bufferResetInProgress = false;
+        replacingBuffer = false;
         mediaRequest = null;
         isReplacementRequest = false;
     }
@@ -699,48 +520,40 @@ function ScheduleController(config) {
     function reset() {
         //eventBus.off(Events.LIVE_EDGE_SEARCH_COMPLETED, onLiveEdgeSearchCompleted, this);
         eventBus.off(Events.DATA_UPDATE_STARTED, onDataUpdateStarted, this);
-        eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, this);
-        eventBus.off(Events.BUFFER_LEVEL_STATE_CHANGED, onBufferLevelStateChanged, this);
-        eventBus.off(Events.QUALITY_CHANGE_REQUESTED, onQualityChanged, this);
         eventBus.off(Events.FRAGMENT_LOADING_COMPLETED, onFragmentLoadingCompleted, this);
         eventBus.off(Events.STREAM_COMPLETED, onStreamCompleted, this);
-        eventBus.off(Events.STREAM_INITIALIZED, onStreamInitialized, this);
-        eventBus.off(Events.QUOTA_EXCEEDED, onQuotaExceeded, this);
-        eventBus.off(Events.BYTES_APPENDED_END_FRAGMENT, onBytesAppended, this);
         eventBus.off(Events.BUFFER_CLEARED, onBufferCleared, this);
-        eventBus.off(Events.INIT_REQUESTED, onInitRequested, this);
-        eventBus.off(Events.PLAYBACK_RATE_CHANGED, onPlaybackRateChanged, this);
+        eventBus.off(Events.BYTES_APPENDED_END_FRAGMENT, onBytesAppended, this);
+        eventBus.off(Events.QUOTA_EXCEEDED, onQuotaExceeded, this);
         eventBus.off(Events.PLAYBACK_SEEKING, onPlaybackSeeking, this);
         eventBus.off(Events.PLAYBACK_STARTED, onPlaybackStarted, this);
+        eventBus.off(Events.PLAYBACK_RATE_CHANGED, onPlaybackRateChanged, this);
         eventBus.off(Events.PLAYBACK_TIME_UPDATED, onPlaybackTimeUpdated, this);
         eventBus.off(Events.URL_RESOLUTION_FAILED, onURLResolutionFailed, this);
         eventBus.off(Events.FRAGMENT_LOADING_ABANDONED, onFragmentLoadingAbandoned, this);
-        if (adapter.getIsTextTrack(type)) {
-            eventBus.off(Events.TIMED_TEXT_REQUESTED, onTimedTextRequested, this);
-        }
+        eventBus.off(Events.BUFFERING_COMPLETED, onBufferingCompleted, this);
 
         stop();
         completeQualityChange(false);
         resetInitialSettings();
-        if (liveEdgeFinder) {
-            liveEdgeFinder.reset();
-            liveEdgeFinder = null;
-        }
     }
 
     instance = {
         initialize: initialize,
         getType: getType,
+        getStreamId: getStreamId,
+        setCurrentRepresentation: setCurrentRepresentation,
         setSeekTarget: setSeekTarget,
         setTimeToLoadDelay: setTimeToLoadDelay,
-        replaceRequest: replaceRequest,
+        getTimeToLoadDelay: getTimeToLoadDelay,
         switchTrackAsked: switchTrackAsked,
         isStarted: isStarted,
         start: start,
         stop: stop,
         reset: reset,
         getBufferTarget: getBufferTarget,
-        finalisePlayList: finalisePlayList
+        processInitRequest: processInitRequest,
+        processMediaRequest: processMediaRequest
     };
 
     setup();
diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
index 4df7f7d4e0..a908585094 100644
--- a/src/streaming/controllers/StreamController.js
+++ b/src/streaming/controllers/StreamController.js
@@ -90,14 +90,11 @@ function StreamController() {
         mediaPlayerModel,
         isPaused,
         initialPlayback,
-        videoTrackDetected,
-        audioTrackDetected,
         isPeriodSwitchInProgress,
         playbackEndedTimerId,
         prefetchTimerId,
         wallclockTicked,
         buffers,
-        useSmoothPeriodTransition,
         preloading,
         lastPlaybackTime,
         supportsChangeType,
@@ -177,7 +174,7 @@ function StreamController() {
      * Used to determine the time current stream is finished and we should switch to the next stream.
      */
     function onPlaybackTimeUpdated(/*e*/) {
-        if (isTrackTypePresent(Constants.VIDEO)) {
+        if (hasVideoTrack()) {
             const playbackQuality = videoModel.getPlaybackQuality();
             if (playbackQuality) {
                 dashMetrics.addDroppedFrames(playbackQuality);
@@ -273,7 +270,7 @@ function StreamController() {
         if (seekingStream && (seekingStream !== activeStream || (preloading && !activeStream.isActive()))) {
             // If we're preloading other stream, the active one was deactivated and we need to switch back
             flushPlaylistMetrics(PlayListTrace.END_OF_PERIOD_STOP_REASON);
-            switchStream(activeStream, seekingStream, e.seekTime);
+            switchStream(seekingStream, activeStream, e.seekTime);
         } else {
             flushPlaylistMetrics(PlayListTrace.USER_REQUEST_STOP_REASON);
         }
@@ -339,16 +336,11 @@ function StreamController() {
     function onTrackBufferingCompleted(e) {
         // In multiperiod situations, as soon as one of the tracks (AUDIO, VIDEO) is finished we should
         // start doing prefetching of the next period
-        if (!e.sender) {
-            return;
-        }
-        if (e.sender.getType() !== Constants.AUDIO && e.sender.getType() !== Constants.VIDEO) {
-            return;
-        }
+        if (e.mediaType !== Constants.AUDIO && e.mediaType !== Constants.VIDEO) return;
 
         const isLast = getActiveStreamInfo().isLast;
         if (mediaSource && !isLast && playbackEndedTimerId === undefined) {
-            logger.info('[onTrackBufferingCompleted] end of period detected. Track', e.sender.getType(), 'has finished');
+            logger.info('[onTrackBufferingCompleted] end of period detected. Track', e.mediaType, 'has finished');
             isPeriodSwitchInProgress = true;
             if (isPaused === false) {
                 toggleEndPeriodTimer();
@@ -370,13 +362,13 @@ function StreamController() {
         if (mediaSource && !isLast) {
             const newStream = getNextStream();
 
-            // Smooth period transition allowed only if both of these conditions are true:
-            // 1.- None of the periods uses contentProtection.
-            // 2.- changeType method implemented by browser or periods use the same codec.
-            useSmoothPeriodTransition = activeStream.isProtectionCompatible(newStream) &&
+            // Seamless period switch allowed only if:
+            // - none of the periods uses contentProtection.
+            // - AND changeType method implemented by browser or periods use the same codec.
+            let seamlessPeriodSwitch = activeStream.isProtectionCompatible(newStream) &&
                 (supportsChangeType || activeStream.isMediaCodecCompatible(newStream));
 
-            if (useSmoothPeriodTransition) {
+            if (seamlessPeriodSwitch) {
                 logger.info('[onStreamCanLoadNext] Preloading next stream');
                 activeStream.deactivate(true);
                 newStream.preload(mediaSource, buffers);
@@ -453,9 +445,7 @@ function StreamController() {
     function onEnded() {
         const nextStream = getNextStream();
         if (nextStream) {
-            audioTrackDetected = undefined;
-            videoTrackDetected = undefined;
-            switchStream(activeStream, nextStream, NaN);
+            switchStream(nextStream, activeStream, NaN);
         } else {
             logger.debug('StreamController no next stream found');
         }
@@ -475,46 +465,49 @@ function StreamController() {
         }
     }
 
-    function switchStream(oldStream, newStream, seekTime) {
-        if (isStreamSwitchingInProgress || !newStream || (oldStream === newStream && newStream.isActive())) return;
+    function switchStream(stream, previousStream, seekTime) {
+        logger.info('Switch stream to ' + stream.getId() + ' at t=' + seekTime);
+
+        if (isStreamSwitchingInProgress || !stream || (previousStream === stream && stream.isActive())) return;
         isStreamSwitchingInProgress = true;
 
         eventBus.trigger(Events.PERIOD_SWITCH_STARTED, {
-            fromStreamInfo: oldStream ? oldStream.getStreamInfo() : null,
-            toStreamInfo: newStream.getStreamInfo()
+            fromStreamInfo: previousStream ? previousStream.getStreamInfo() : null,
+            toStreamInfo: stream.getStreamInfo()
         });
 
-        useSmoothPeriodTransition = false;
-        if (oldStream) {
-            useSmoothPeriodTransition = (activeStream.isProtectionCompatible(newStream) &&
-                (supportsChangeType || activeStream.isMediaCodecCompatible(newStream))) &&
-                !seekTime || newStream.getPreloaded();
-            oldStream.deactivate(useSmoothPeriodTransition);
+        let seamlessPeriodSwitch = false;
+        if (previousStream) {
+            seamlessPeriodSwitch = (activeStream.isProtectionCompatible(stream) &&
+                (supportsChangeType || activeStream.isMediaCodecCompatible(stream))) &&
+                !seekTime || stream.getPreloaded();
+            previousStream.deactivate(seamlessPeriodSwitch);
         }
 
-        activeStream = newStream;
+        // Determine seek time when switching to new period
+        // - seek at given seek time
+        // - or seek at period start if seamless period switching
+        seekTime = !isNaN(seekTime) ? seekTime : (!seamlessPeriodSwitch && previousStream ? stream.getStreamInfo().start : NaN);
+
+        activeStream = stream;
         preloading = false;
-        playbackController.initialize(getActiveStreamInfo(), useSmoothPeriodTransition);
+        playbackController.initialize(getActiveStreamInfo(), !!previousStream, seekTime);
         if (videoModel.getElement()) {
             //TODO detect if we should close jump to activateStream.
-            openMediaSource(seekTime, oldStream, false, useSmoothPeriodTransition);
+            openMediaSource(seekTime, (previousStream === null), false, seamlessPeriodSwitch);
         } else {
-            preloadStream(seekTime);
+            activateStream(seekTime, seamlessPeriodSwitch);
         }
     }
 
-    function preloadStream(seekTime) {
-        activateStream(seekTime, useSmoothPeriodTransition);
-    }
-
     function switchToVideoElement(seekTime) {
         if (activeStream) {
             playbackController.initialize(getActiveStreamInfo());
-            openMediaSource(seekTime, null, true, false);
+            openMediaSource(seekTime, false, true, false);
         }
     }
 
-    function openMediaSource(seekTime, oldStream, streamActivated, keepBuffers) {
+    function openMediaSource(seekTime, sourceInitialized, streamActivated, keepBuffers) {
         let sourceUrl;
 
         function onMediaSourceOpen() {
@@ -527,7 +520,7 @@ function StreamController() {
             mediaSource.removeEventListener('webkitsourceopen', onMediaSourceOpen);
             setMediaDuration();
 
-            if (!oldStream) {
+            if (!sourceInitialized) {
                 eventBus.trigger(Events.SOURCE_INITIALIZED);
             }
 
@@ -547,7 +540,7 @@ function StreamController() {
         } else {
             if (keepBuffers) {
                 activateStream(seekTime, keepBuffers);
-                if (!oldStream) {
+                if (!sourceInitialized) {
                     eventBus.trigger(Events.SOURCE_INITIALIZED);
                 }
             } else {
@@ -562,8 +555,6 @@ function StreamController() {
 
     function activateStream(seekTime, keepBuffers) {
         buffers = activeStream.activate(mediaSource, keepBuffers ? buffers : undefined);
-        audioTrackDetected = checkTrackPresence(Constants.AUDIO);
-        videoTrackDetected = checkTrackPresence(Constants.VIDEO);
 
         // check if change type is supported by the browser
         if (buffers) {
@@ -578,12 +569,12 @@ function StreamController() {
             if (!isNaN(seekTime)) {
                 playbackController.seek(seekTime); //we only need to call seek here, IndexHandlerTime was set from seeking event
             } else {
-                let startTime = playbackController.getStreamStartTime(true);
-                if (!keepBuffers) {
-                    getActiveStreamProcessors().forEach(p => {
-                        p.setIndexHandlerTime(startTime);
-                    });
-                }
+                // let startTime = playbackController.getStreamStartTime(true);
+                // if (!keepBuffers) {
+                //     getActiveStreamProcessors().forEach(p => {
+                //         p.setIndexHandlerTime(startTime);
+                //     });
+                // }
             }
         }
 
@@ -649,7 +640,6 @@ function StreamController() {
                         mediaController: mediaController,
                         textController: textController,
                         videoModel: videoModel,
-                        streamController: instance,
                         settings: settings
                     });
                     streams.push(stream);
@@ -662,23 +652,25 @@ function StreamController() {
             }
 
             if (!activeStream) {
+                if (adapter.getIsDynamic() && streams.length) {
+                    // Compute and set live delay
+                    const manifestInfo = streamsInfo[0].manifestInfo;
+                    const fragmentDuration = getFragmentDurationForLiveDelayCalculation(streamsInfo, manifestInfo);
+                    playbackController.computeAndSetLiveDelay(fragmentDuration, manifestInfo.DVRWindowSize, manifestInfo.minBufferTime);
+                }
+
                 // we need to figure out what the correct starting period is
-                const startTimeFormUriParameters = playbackController.getStartTimeFromUriParameters();
                 let initialStream = null;
-                if (startTimeFormUriParameters) {
-                    const initialTime = !isNaN(startTimeFormUriParameters.fragS) ? startTimeFormUriParameters.fragS : startTimeFormUriParameters.fragT;
-                    initialStream = getStreamForTime(initialTime);
+                const startTimeFormUri = playbackController.getStartTimeFromUriParameters(streamsInfo[0].start, adapter.getIsDynamic());
+                if (!isNaN(startTimeFormUri)) {
+                    initialStream = getStreamForTime(startTimeFormUri);
                 }
                 // For multiperiod streams we should avoid a switch of streams after the seek to the live edge. So we do a calculation of the expected seek time to find the right stream object.
                 if (!initialStream && adapter.getIsDynamic() && streams.length) {
-                    logger.debug('Dynamic multi-period stream: Trying to find the correct starting period');
-                    const manifestInfo = adapter.getStreamsInfo(undefined, 1)[0].manifestInfo;
-                    const liveEdge = timelineConverter.calcPresentationTimeFromWallTime(new Date(), adapter.getRegularPeriods()[0]);
-                    const targetDelay = playbackController.computeLiveDelay(NaN, manifestInfo.DVRWindowSize, manifestInfo.minBufferTime);
-                    const targetTime = liveEdge - targetDelay;
-                    initialStream = getStreamForTime(targetTime);
+                    logger.debug('Dynamic stream: Trying to find the correct starting period');
+                    initialStream = getInitialStream();
                 }
-                switchStream(null, initialStream !== null ? initialStream : streams[0], NaN);
+                switchStream(initialStream !== null ? initialStream : streams[0], null, NaN);
             }
 
             eventBus.trigger(Events.STREAMS_COMPOSED);
@@ -690,6 +682,75 @@ function StreamController() {
         }
     }
 
+    function getInitialStream() {
+        try {
+            const liveEdge = timelineConverter.calcPresentationTimeFromWallTime(new Date(), adapter.getRegularPeriods()[0]);
+            const targetDelay = playbackController.getLiveDelay();
+            const targetTime = liveEdge - targetDelay;
+
+            return getStreamForTime(targetTime);
+        } catch (e) {
+            return null;
+        }
+    }
+
+    function getFragmentDurationForLiveDelayCalculation(streamInfos, manifestInfo) {
+        try {
+            let fragmentDuration = NaN;
+
+            //  We use the maxFragmentDuration attribute if present
+            if (manifestInfo && !isNaN(manifestInfo.maxFragmentDuration) && isFinite(manifestInfo.maxFragmentDuration)) {
+                return manifestInfo.maxFragmentDuration;
+            }
+
+            // For single period manifests we can iterate over all AS and use the maximum segment length
+            if (streamInfos && streamInfos.length === 1) {
+                const streamInfo = streamInfos[0];
+                const mediaTypes = [Constants.VIDEO, Constants.AUDIO, Constants.FRAGMENTED_TEXT];
+
+
+                const fragmentDurations = mediaTypes
+                    .reduce((acc, mediaType) => {
+                        const mediaInfo = adapter.getMediaInfoForType(streamInfo, mediaType);
+
+                        if (mediaInfo) {
+                            acc.push(mediaInfo);
+                        }
+
+                        return acc;
+                    }, [])
+                    .reduce((acc, mediaInfo) => {
+                        const voRepresentations = adapter.getVoRepresentations(mediaInfo);
+
+                        if (voRepresentations && voRepresentations.length > 0) {
+                            voRepresentations.forEach((voRepresentation) => {
+                                if (voRepresentation) {
+                                    acc.push(voRepresentation);
+                                }
+                            });
+                        }
+
+                        return acc;
+                    }, [])
+                    .reduce((acc, voRepresentation) => {
+                        const representation = adapter.convertDataToRepresentationInfo(voRepresentation);
+
+                        if (representation && representation.fragmentDuration && !isNaN(representation.fragmentDuration)) {
+                            acc.push(representation.fragmentDuration);
+                        }
+
+                        return acc;
+                    }, []);
+
+                fragmentDuration = Math.max(...fragmentDurations);
+            }
+
+            return isFinite(fragmentDuration) ? fragmentDuration : NaN;
+        } catch (e) {
+            return NaN;
+        }
+    }
+
     function onTimeSyncCompleted( /*e*/) {
         const manifest = manifestModel.getValue();
         //TODO check if we can move this to initialize??
@@ -754,42 +815,19 @@ function StreamController() {
         }
     }
 
-    function isTrackTypePresent(trackType) {
-        let isTrackTypeDetected;
-
-        if (!trackType) {
-            return isTrackTypeDetected;
-        }
-
-        switch (trackType) {
-            case Constants.VIDEO :
-                isTrackTypeDetected = videoTrackDetected;
-                break;
-            case Constants.AUDIO :
-                isTrackTypeDetected = audioTrackDetected;
-                break;
-        }
-        return isTrackTypeDetected;
+    function hasVideoTrack() {
+        return activeStream ? activeStream.getHasVideoTrack() : false;
     }
 
-    function checkTrackPresence(type) {
-        let isDetected = false;
-        getActiveStreamProcessors().forEach(p => {
-            if (p.getMediaInfo().type === type) {
-                isDetected = true;
-            }
-        });
-        return isDetected;
+    function hasAudioTrack() {
+        return activeStream ? activeStream.getHasAudioTrack() : false;
     }
 
     function flushPlaylistMetrics(reason, time) {
         time = time || new Date();
 
         getActiveStreamProcessors().forEach(p => {
-            const ctrlr = p.getScheduleController();
-            if (ctrlr) {
-                ctrlr.finalisePlayList(time, reason);
-            }
+            p.finalisePlayList(time, reason);
         });
         dashMetrics.addPlayList();
     }
@@ -947,8 +985,6 @@ function StreamController() {
         activeStream = null;
         hasMediaError = false;
         hasInitialisationError = false;
-        videoTrackDetected = undefined;
-        audioTrackDetected = undefined;
         initialPlayback = true;
         isPaused = false;
         autoPlay = true;
@@ -1008,7 +1044,8 @@ function StreamController() {
         if (e.metric === MetricsConstants.DVR_INFO) {
             //Match media type? How can DVR window be different for media types?
             //Should we normalize and union the two?
-            if (e.mediaType === Constants.AUDIO) {
+            const targetMediaType = hasAudioTrack() ? Constants.AUDIO : Constants.VIDEO;
+            if (e.mediaType === targetMediaType) {
                 mediaSourceController.setSeekable(mediaSource, e.value.range.start, e.value.range.end);
             }
         }
@@ -1017,7 +1054,8 @@ function StreamController() {
     instance = {
         initialize: initialize,
         getActiveStreamInfo: getActiveStreamInfo,
-        isTrackTypePresent: isTrackTypePresent,
+        hasVideoTrack: hasVideoTrack,
+        hasAudioTrack: hasAudioTrack,
         switchToVideoElement: switchToVideoElement,
         getStreamById: getStreamById,
         getStreamForTime: getStreamForTime,
diff --git a/src/streaming/models/MediaPlayerModel.js b/src/streaming/models/MediaPlayerModel.js
index 37c51335cc..7ec97d41dd 100644
--- a/src/streaming/models/MediaPlayerModel.js
+++ b/src/streaming/models/MediaPlayerModel.js
@@ -33,7 +33,7 @@ import FactoryMaker from '../../core/FactoryMaker';
 import Constants from '../constants/Constants';
 import ABRRulesCollection from '../rules/abr/ABRRulesCollection';
 import Settings from '../../core/Settings';
-import { checkParameterType} from '../utils/SupervisorTools';
+import {checkParameterType} from '../utils/SupervisorTools';
 
 
 const DEFAULT_MIN_BUFFER_TIME = 12;
@@ -42,6 +42,7 @@ const DEFAULT_MIN_BUFFER_TIME_FAST_SWITCH = 20;
 const DEFAULT_LOW_LATENCY_LIVE_DELAY = 3.0;
 const LOW_LATENCY_REDUCTION_FACTOR = 10;
 const LOW_LATENCY_MULTIPLY_FACTOR = 5;
+const DEFAULT_LIVE_LATENCY_CATCHUP_THRESHOLD_FACTOR = 2;
 
 const DEFAULT_XHR_WITH_CREDENTIALS = false;
 
@@ -53,9 +54,9 @@ function MediaPlayerModel() {
         customABRRule;
 
     const DEFAULT_UTC_TIMING_SOURCE = {
-            scheme: 'urn:mpeg:dash:utc:http-xsdate:2014',
-            value: 'http://time.akamai.com/?iso&ms'
-        };
+        scheme: 'urn:mpeg:dash:utc:http-xsdate:2014',
+        value: 'http://time.akamai.com/?iso&ms'
+    };
     const context = this.context;
     const settings = Settings(context).getInstance();
 
@@ -126,11 +127,15 @@ function MediaPlayerModel() {
     }
 
     function getRetryAttemptsForType(type) {
-        return settings.get().streaming.lowLatencyEnabled ? settings.get().streaming.retryAttempts[type] * LOW_LATENCY_MULTIPLY_FACTOR : settings.get().streaming.retryAttempts[type];
+        const lowLatencyMultiplyFactor = !isNaN(settings.get().streaming.retryAttempts.lowLatencyMultiplyFactor) ? settings.get().streaming.retryAttempts.lowLatencyMultiplyFactor : LOW_LATENCY_MULTIPLY_FACTOR;
+
+        return settings.get().streaming.lowLatencyEnabled ? settings.get().streaming.retryAttempts[type] * lowLatencyMultiplyFactor : settings.get().streaming.retryAttempts[type];
     }
 
     function getRetryIntervalsForType(type) {
-        return settings.get().streaming.lowLatencyEnabled ? settings.get().streaming.retryIntervals[type] / LOW_LATENCY_REDUCTION_FACTOR : settings.get().streaming.retryIntervals[type];
+        const lowLatencyReductionFactor = !isNaN(settings.get().streaming.retryIntervals.lowLatencyReductionFactor) ? settings.get().streaming.retryIntervals.lowLatencyReductionFactor : LOW_LATENCY_REDUCTION_FACTOR;
+
+        return settings.get().streaming.lowLatencyEnabled ? settings.get().streaming.retryIntervals[type] / lowLatencyReductionFactor : settings.get().streaming.retryIntervals[type];
     }
 
     function getLiveDelay() {
@@ -140,6 +145,30 @@ function MediaPlayerModel() {
         return settings.get().streaming.liveDelay;
     }
 
+    function getLiveCatchupLatencyThreshold() {
+        try {
+            const liveCatchupLatencyThreshold = settings.get().streaming.liveCatchupLatencyThreshold;
+            const liveDelay = getLiveDelay();
+
+            if (liveCatchupLatencyThreshold !== null && !isNaN(liveCatchupLatencyThreshold)) {
+                return Math.max(liveCatchupLatencyThreshold, liveDelay);
+            }
+
+
+            const liveCatchupMinDrift = settings.get().streaming.liveCatchUpMinDrift;
+            const maximumLiveDelay = !isNaN(liveDelay) && liveDelay ? !isNaN(liveCatchupMinDrift) ? settings.get().streaming.liveCatchUpMinDrift + getLiveDelay() : getLiveDelay() : NaN;
+
+            if (maximumLiveDelay && !isNaN(maximumLiveDelay)) {
+                return maximumLiveDelay * DEFAULT_LIVE_LATENCY_CATCHUP_THRESHOLD_FACTOR;
+            }
+
+            return NaN;
+
+        } catch (e) {
+            return NaN;
+        }
+    }
+
     function addUTCTimingSource(schemeIdUri, value) {
         removeUTCTimingSource(schemeIdUri, value); //check if it already exists and remove if so.
         let vo = new UTCTiming();
@@ -196,22 +225,23 @@ function MediaPlayerModel() {
     }
 
     instance = {
-        getABRCustomRules: getABRCustomRules,
-        addABRCustomRule: addABRCustomRule,
-        removeABRCustomRule: removeABRCustomRule,
-        getStableBufferTime: getStableBufferTime,
-        getRetryAttemptsForType: getRetryAttemptsForType,
-        getRetryIntervalsForType: getRetryIntervalsForType,
-        getLiveDelay: getLiveDelay,
-        addUTCTimingSource: addUTCTimingSource,
-        removeUTCTimingSource: removeUTCTimingSource,
-        getUTCTimingSources: getUTCTimingSources,
-        clearDefaultUTCTimingSources: clearDefaultUTCTimingSources,
-        restoreDefaultUTCTimingSources: restoreDefaultUTCTimingSources,
-        setXHRWithCredentialsForType: setXHRWithCredentialsForType,
-        getXHRWithCredentialsForType: getXHRWithCredentialsForType,
-        getDefaultUtcTimingSource: getDefaultUtcTimingSource,
-        reset: reset
+        getABRCustomRules,
+        addABRCustomRule,
+        removeABRCustomRule,
+        getStableBufferTime,
+        getRetryAttemptsForType,
+        getRetryIntervalsForType,
+        getLiveDelay,
+        getLiveCatchupLatencyThreshold,
+        addUTCTimingSource,
+        removeUTCTimingSource,
+        getUTCTimingSources,
+        clearDefaultUTCTimingSources,
+        restoreDefaultUTCTimingSources,
+        setXHRWithCredentialsForType,
+        getXHRWithCredentialsForType,
+        getDefaultUtcTimingSource,
+        reset
     };
 
     setup();
@@ -221,4 +251,4 @@ function MediaPlayerModel() {
 
 //TODO see if you can move this and not export and just getter to get default value.
 MediaPlayerModel.__dashjs_factory_name = 'MediaPlayerModel';
-export default FactoryMaker.getSingletonFactory(MediaPlayerModel);
\ No newline at end of file
+export default FactoryMaker.getSingletonFactory(MediaPlayerModel);
diff --git a/src/streaming/net/SchemeLoaderFactory.js b/src/streaming/net/SchemeLoaderFactory.js
index 00205bfa54..e4710ff2e3 100644
--- a/src/streaming/net/SchemeLoaderFactory.js
+++ b/src/streaming/net/SchemeLoaderFactory.js
@@ -34,7 +34,7 @@ import HTTPLoader from '../../streaming/net/HTTPLoader';
 /**
  * @module
  * @description Choose right url loader for scheme
-
+ * @ignore
  */
 function SchemeLoaderFactory() {
 
diff --git a/src/streaming/net/URLLoader.js b/src/streaming/net/URLLoader.js
index 8587cfc764..6d66e7e4c7 100644
--- a/src/streaming/net/URLLoader.js
+++ b/src/streaming/net/URLLoader.js
@@ -32,9 +32,10 @@ import FactoryMaker from '../../core/FactoryMaker';
 import SchemeLoaderFactory from '../../streaming/net/SchemeLoaderFactory';
 
 /**
- * @module URLLoader
+ * @class URLLoader
  * @description  Call Offline Loader or Online Loader dependaing on URL
  * @param {Object} cfg - dependances
+ * @ignore
 */
 function URLLoader(cfg) {
 
diff --git a/src/streaming/protection/CommonEncryption.js b/src/streaming/protection/CommonEncryption.js
index 9efa46660f..c76ebb6f56 100644
--- a/src/streaming/protection/CommonEncryption.js
+++ b/src/streaming/protection/CommonEncryption.js
@@ -104,6 +104,10 @@ class CommonEncryption {
      */
     static parseInitDataFromContentProtection(cpData, BASE64) {
         if ('pssh' in cpData) {
+
+            // Remove whitespaces and newlines from pssh text
+            cpData.pssh.__text = cpData.pssh.__text.replace(/\r?\n|\r/g,'').replace(/\s+/g,'');
+
             return BASE64.decodeArray(cpData.pssh.__text).buffer;
         }
         return null;
diff --git a/src/streaming/rules/ThroughputHistory.js b/src/streaming/rules/ThroughputHistory.js
index d9c0a8f04c..8dcc391284 100644
--- a/src/streaming/rules/ThroughputHistory.js
+++ b/src/streaming/rules/ThroughputHistory.js
@@ -159,7 +159,7 @@ function ThroughputHistory(config) {
         } else if (isThroughput) {
             // if throughput samples vary a lot, average over a wider sample
             for (let i = 1; i < sampleSize; ++i) {
-                const ratio = arr[i] / arr[i - 1];
+                const ratio = arr[arr.length - i] / arr[arr.length - i - 1];
                 if (ratio >= THROUGHPUT_INCREASE_SCALE || ratio <= 1 / THROUGHPUT_DECREASE_SCALE) {
                     sampleSize += 1;
                     if (sampleSize === arr.length) { // cannot increase sampleSize beyond arr.length
diff --git a/src/streaming/rules/abr/InsufficientBufferRule.js b/src/streaming/rules/abr/InsufficientBufferRule.js
index 91ea3bac0a..2b61732423 100644
--- a/src/streaming/rules/abr/InsufficientBufferRule.js
+++ b/src/streaming/rules/abr/InsufficientBufferRule.js
@@ -40,6 +40,7 @@ function InsufficientBufferRule(config) {
 
     config = config || {};
     const INSUFFICIENT_BUFFER_SAFETY_FACTOR = 0.5;
+    const SEGMENT_IGNORE_COUNT = 2;
 
     const context = this.context;
 
@@ -54,6 +55,7 @@ function InsufficientBufferRule(config) {
         logger = Debug(context).getInstance().getLogger(instance);
         resetInitialSettings();
         eventBus.on(Events.PLAYBACK_SEEKING, onPlaybackSeeking, instance);
+        eventBus.on(Events.BYTES_APPENDED_END_FRAGMENT, onEndFragment, instance);
     }
 
     function checkConfig() {
@@ -61,6 +63,7 @@ function InsufficientBufferRule(config) {
             throw new Error(Constants.MISSING_CONFIG_ERROR);
         }
     }
+
     /*
      * InsufficientBufferRule does not kick in before the first BUFFER_LOADED event happens. This is reset at every seek.
      *
@@ -71,7 +74,7 @@ function InsufficientBufferRule(config) {
      * If the bufferLevel is low, then InsufficientBufferRule avoids rebuffering risk.
      * If the bufferLevel is high, then InsufficientBufferRule give a high MaxIndex allowing other rules to take over.
      */
-    function getMaxIndex (rulesContext) {
+    function getMaxIndex(rulesContext) {
         const switchRequest = SwitchRequest(context).create();
 
         if (!rulesContext || !rulesContext.hasOwnProperty('getMediaType')) {
@@ -86,11 +89,11 @@ function InsufficientBufferRule(config) {
         const fragmentDuration = representationInfo.fragmentDuration;
 
         // Don't ask for a bitrate change if there is not info about buffer state or if fragmentDuration is not defined
-        if (!currentBufferState || !wasFirstBufferLoadedEventTriggered(mediaType, currentBufferState) || !fragmentDuration) {
+        if (shouldIgnore(mediaType) || !fragmentDuration) {
             return switchRequest;
         }
 
-        if (currentBufferState.state === MetricsConstants.BUFFER_EMPTY) {
+        if (currentBufferState && currentBufferState.state === MetricsConstants.BUFFER_EMPTY) {
             logger.debug('[' + mediaType + '] Switch to index 0; buffer is empty.');
             switchRequest.quality = 0;
             switchRequest.reason = 'InsufficientBufferRule: Buffer is empty';
@@ -111,30 +114,32 @@ function InsufficientBufferRule(config) {
         return switchRequest;
     }
 
-    function wasFirstBufferLoadedEventTriggered(mediaType, currentBufferState) {
-        bufferStateDict[mediaType] = bufferStateDict[mediaType] || {};
-
-        let wasTriggered = false;
-        if (bufferStateDict[mediaType].firstBufferLoadedEvent) {
-            wasTriggered = true;
-        } else if (currentBufferState && currentBufferState.state === MetricsConstants.BUFFER_LOADED) {
-            bufferStateDict[mediaType].firstBufferLoadedEvent = true;
-            wasTriggered = true;
-        }
-        return wasTriggered;
+    function shouldIgnore(mediaType) {
+        return bufferStateDict[mediaType].ignoreCount > 0;
     }
 
     function resetInitialSettings() {
         bufferStateDict = {};
+        bufferStateDict[Constants.VIDEO] = {ignoreCount: SEGMENT_IGNORE_COUNT};
+        bufferStateDict[Constants.AUDIO] = {ignoreCount: SEGMENT_IGNORE_COUNT};
     }
 
     function onPlaybackSeeking() {
         resetInitialSettings();
     }
 
+    function onEndFragment(e) {
+        if (!isNaN(e.startTime) && (e.mediaType === Constants.AUDIO || e.mediaType === Constants.VIDEO)) {
+            if (bufferStateDict[e.mediaType].ignoreCount > 0) {
+                bufferStateDict[e.mediaType].ignoreCount--;
+            }
+        }
+    }
+
     function reset() {
         resetInitialSettings();
         eventBus.off(Events.PLAYBACK_SEEKING, onPlaybackSeeking, instance);
+        eventBus.off(Events.BYTES_APPENDED_END_FRAGMENT, onEndFragment, instance);
     }
 
     instance = {
diff --git a/src/streaming/rules/scheduling/BufferLevelRule.js b/src/streaming/rules/scheduling/BufferLevelRule.js
index 3257a77fad..c61f408b70 100644
--- a/src/streaming/rules/scheduling/BufferLevelRule.js
+++ b/src/streaming/rules/scheduling/BufferLevelRule.js
@@ -44,22 +44,21 @@ function BufferLevelRule(config) {
     function setup() {
     }
 
-    function execute(streamProcessor, videoTrackPresent) {
-        if (!streamProcessor) {
+    function execute(type, representationInfo, hasVideoTrack) {
+        if (!type || !representationInfo) {
             return true;
         }
-        const bufferLevel = dashMetrics.getCurrentBufferLevel(streamProcessor.getType());
-        return bufferLevel < getBufferTarget(streamProcessor, videoTrackPresent);
+        const bufferLevel = dashMetrics.getCurrentBufferLevel(type);
+        return bufferLevel < getBufferTarget(type, representationInfo, hasVideoTrack);
     }
 
-    function getBufferTarget(streamProcessor, videoTrackPresent) {
+    function getBufferTarget(type, representationInfo, hasVideoTrack) {
         let bufferTarget = NaN;
 
-        if (!streamProcessor) {
+        if (!type || !representationInfo) {
             return bufferTarget;
         }
-        const type = streamProcessor.getType();
-        const representationInfo = streamProcessor.getRepresentationInfo();
+
         if (type === Constants.FRAGMENTED_TEXT) {
             if (textController.isTextEnabled()) {
                 if (isNaN(representationInfo.fragmentDuration)) { //fragmentDuration of representationInfo is not defined,
@@ -73,7 +72,7 @@ function BufferLevelRule(config) {
             } else { // text is disabled, rule will return false
                 bufferTarget = 0;
             }
-        } else if (type === Constants.AUDIO && videoTrackPresent) {
+        } else if (type === Constants.AUDIO && hasVideoTrack) {
             const videoBufferLevel = dashMetrics.getCurrentBufferLevel(Constants.VIDEO);
             if (isNaN(representationInfo.fragmentDuration)) {
                 bufferTarget = videoBufferLevel;
diff --git a/src/streaming/rules/scheduling/NextFragmentRequestRule.js b/src/streaming/rules/scheduling/NextFragmentRequestRule.js
deleted file mode 100644
index 8703a9c474..0000000000
--- a/src/streaming/rules/scheduling/NextFragmentRequestRule.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * The copyright in this software is being made available under the BSD License,
- * included below. This software may be subject to other third party and contributor
- * rights, including patent rights, and no such rights are granted under this license.
- *
- * Copyright (c) 2013, Dash Industry Forum.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *  * Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation and/or
- *  other materials provided with the distribution.
- *  * Neither the name of Dash Industry Forum nor the names of its
- *  contributors may be used to endorse or promote products derived from this software
- *  without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
- *  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-import Constants from '../../constants/Constants';
-import Debug from '../../../core/Debug';
-import FactoryMaker from '../../../core/FactoryMaker';
-import FragmentRequest from '../../../streaming/vo/FragmentRequest';
-
-function NextFragmentRequestRule(config) {
-
-    config = config || {};
-    const context = this.context;
-    const textController = config.textController;
-    const playbackController = config.playbackController;
-
-    let instance,
-        logger;
-
-    function setup() {
-        logger = Debug(context).getInstance().getLogger(instance);
-    }
-
-    function execute(streamProcessor, seekTarget, requestToReplace) {
-        if (!streamProcessor) {
-            return null;
-        }
-        const representationInfo = streamProcessor.getRepresentationInfo();
-        const mediaType = streamProcessor.getType();
-        const hasSeekTarget = !isNaN(seekTarget);
-        const bufferController = streamProcessor.getBufferController();
-        const currentTime = playbackController.getNormalizedTime();
-        let time = hasSeekTarget ? seekTarget : streamProcessor.getIndexHandlerTime();
-        let bufferIsDivided = false;
-        let request;
-
-        if (isNaN(time) || (mediaType === Constants.FRAGMENTED_TEXT && !textController.isTextEnabled())) {
-            return null;
-        }
-        /**
-         * This is critical for IE/Safari/EDGE
-         * */
-        if (bufferController) {
-            let range = bufferController.getRangeAt(time);
-            const playingRange = bufferController.getRangeAt(currentTime);
-            const hasDiscontinuities = bufferController.getBuffer().hasDiscontinuitiesAfter(currentTime);
-            if ((range !== null || playingRange !== null) && !hasSeekTarget) {
-                if (!range || (playingRange && playingRange.start != range.start && playingRange.end != range.end)) {
-                    if (hasDiscontinuities && mediaType !== Constants.FRAGMENTED_TEXT) {
-                        streamProcessor.getFragmentModel().removeExecutedRequestsAfterTime(playingRange.end);
-                        bufferIsDivided = true;
-                    }
-                    range = playingRange;
-                }
-            }
-        }
-
-        if (requestToReplace) {
-            time = requestToReplace.startTime + (requestToReplace.duration / 2);
-            request = streamProcessor.getFragmentRequest(representationInfo, time, {
-                timeThreshold: 0,
-                ignoreIsFinished: true
-            });
-        } else {
-            // Use time just whenever is strictly needed
-            request = streamProcessor.getFragmentRequest(representationInfo,
-                hasSeekTarget || bufferIsDivided ? time : undefined, {
-                keepIdx: !hasSeekTarget && !bufferIsDivided
-            });
-
-            // Then, check if this request was downloaded or not
-            while (request && request.action !== FragmentRequest.ACTION_COMPLETE && streamProcessor.getFragmentModel().isFragmentLoaded(request)) {
-                // loop until we found not loaded fragment, or no fragment
-                request = streamProcessor.getFragmentRequest(representationInfo);
-            }
-        }
-
-        return request;
-    }
-
-    instance = {
-        execute: execute
-    };
-
-    setup();
-
-    return instance;
-}
-
-NextFragmentRequestRule.__dashjs_factory_name = 'NextFragmentRequestRule';
-export default FactoryMaker.getClassFactory(NextFragmentRequestRule);
diff --git a/src/streaming/text/NotFragmentedTextBufferController.js b/src/streaming/text/NotFragmentedTextBufferController.js
index 1b062a7d63..a7cbeeb858 100644
--- a/src/streaming/text/NotFragmentedTextBufferController.js
+++ b/src/streaming/text/NotFragmentedTextBufferController.js
@@ -42,15 +42,15 @@ const BUFFER_CONTROLLER_TYPE = 'NotFragmentedTextBufferController';
 function NotFragmentedTextBufferController(config) {
 
     config = config || {};
-    let context = this.context;
-    let eventBus = EventBus(context).getInstance();
+    const context = this.context;
+    const eventBus = EventBus(context).getInstance();
     const textController = TextController(context).getInstance();
 
-    let errHandler = config.errHandler;
-    let streamId = config.streamId;
-    let type = config.type;
-    let mimeType = config.mimeType;
-    let streamProcessor = config.streamProcessor;
+    const errHandler = config.errHandler;
+    const streamInfo = config.streamInfo;
+    const type = config.type;
+    const mimeType = config.mimeType;
+    const fragmentModel = config.fragmentModel;
 
     let instance,
         isBufferingCompleted,
@@ -77,17 +77,14 @@ function NotFragmentedTextBufferController(config) {
         initCache = InitCache(context).getInstance();
     }
 
-    /**
-     * @param {MediaInfo }mediaInfo
-     * @memberof BufferController#
-     */
-    function createBuffer(mediaInfo) {
+    function createBuffer(mediaInfoArr) {
+        const mediaInfo = mediaInfoArr[0];
         try {
             buffer = SourceBufferSink(context).create(mediaSource, mediaInfo);
             if (!initialized) {
                 const textBuffer = buffer.getBuffer();
                 if (textBuffer.hasOwnProperty(Constants.INITIALIZE)) {
-                    textBuffer.initialize(mimeType, streamProcessor);
+                    textBuffer.initialize(mimeType, streamInfo, mediaInfoArr, fragmentModel);
                 }
                 initialized = true;
             }
@@ -121,10 +118,6 @@ function NotFragmentedTextBufferController(config) {
         return mediaSource;
     }
 
-    function getStreamProcessor() {
-        return streamProcessor;
-    }
-
     function getIsPruningInProgress() {
         return false;
     }
@@ -132,9 +125,6 @@ function NotFragmentedTextBufferController(config) {
     function dischargePreBuffer() {
     }
 
-    function setSeekStartTime() { //Unused - TODO Remove need for stub function
-    }
-
     function getBufferLevel() {
         return 0;
     }
@@ -155,43 +145,42 @@ function NotFragmentedTextBufferController(config) {
     }
 
     function onDataUpdateCompleted(e) {
-        if (e.sender.getType() !== streamProcessor.getType() || e.error) return;
+        if (e.sender.getStreamId() !== streamInfo.id || e.sender.getType() !== type || e.error) return;
 
-        const streamId = e.sender.getStreamId();
-        const currentRepresentation = e.sender.getCurrentRepresentation();
+        if (initCache.extract(streamInfo.id, e.currentRepresentation.id) !== null) {
+            return;
+        }
 
-        const chunk = initCache.extract(streamId, currentRepresentation ? currentRepresentation.id : null);
+        // Representation has changed, clear buffer
+        isBufferingCompleted = false;
 
-        if (!chunk) {
-            eventBus.trigger(Events.TIMED_TEXT_REQUESTED, {
-                index: 0,
-                sender: e.sender
-            }); //TODO make index dynamic if referring to MP?
-        }
+        // // Text data file is contained in initialization segment
+        eventBus.trigger(Events.INIT_FRAGMENT_NEEDED, {
+            sender: instance,
+            streamId: streamInfo.id,
+            mediaType: type,
+            representationId: e.currentRepresentation.id
+        });
+    }
+
+    function appendInitSegment(representationId) {
+        // If text data file already in cache then no need to append it again
+        return initCache.extract(streamInfo.id, representationId) !== null;
     }
 
     function onInitFragmentLoaded(e) {
-        if (e.chunk.streamId !== streamId || e.chunk.mediaInfo.type !== type || (!e.chunk.bytes)) return;
+        if (e.chunk.streamId !== streamInfo.id || e.chunk.mediaInfo.type !== type || (!e.chunk.bytes)) return;
 
         initCache.save(e.chunk);
         buffer.append(e.chunk);
 
+        isBufferingCompleted = true;
+
         eventBus.trigger(Events.STREAM_COMPLETED, {
             request: e.request
         });
     }
 
-    function switchInitData(streamId, representationId) {
-        const chunk = initCache.extract(streamId, representationId);
-
-        if (!chunk) {
-            eventBus.trigger(Events.TIMED_TEXT_REQUESTED, {
-                index: 0,
-                sender: instance
-            });
-        }
-    }
-
     function getRangeAt() {
         return null;
     }
@@ -207,8 +196,6 @@ function NotFragmentedTextBufferController(config) {
         initialize: initialize,
         createBuffer: createBuffer,
         getType: getType,
-        getStreamProcessor: getStreamProcessor,
-        setSeekStartTime: setSeekStartTime,
         getBuffer: getBuffer,
         getBufferLevel: getBufferLevel,
         setMediaSource: setMediaSource,
@@ -216,7 +203,7 @@ function NotFragmentedTextBufferController(config) {
         getIsBufferingCompleted: getIsBufferingCompleted,
         getIsPruningInProgress: getIsPruningInProgress,
         dischargePreBuffer: dischargePreBuffer,
-        switchInitData: switchInitData,
+        appendInitSegment: appendInitSegment,
         getRangeAt: getRangeAt,
         reset: reset,
         updateTimestampOffset: updateTimestampOffset
diff --git a/src/streaming/text/TextBufferController.js b/src/streaming/text/TextBufferController.js
index 1bd7d6be61..427354458a 100644
--- a/src/streaming/text/TextBufferController.js
+++ b/src/streaming/text/TextBufferController.js
@@ -48,31 +48,29 @@ function TextBufferController(config) {
 
             // in this case, internal buffer ocntroller is a classical BufferController object
             _BufferControllerImpl = BufferController(context).create({
-                streamId: config.streamId,
+                streamInfo: config.streamInfo,
                 type: config.type,
-                dashMetrics: config.dashMetrics,
                 mediaPlayerModel: config.mediaPlayerModel,
                 manifestModel: config.manifestModel,
                 fragmentModel: config.fragmentModel,
                 errHandler: config.errHandler,
-                streamController: config.streamController,
                 mediaController: config.mediaController,
+                representationController: config.representationController,
                 adapter: config.adapter,
                 textController: config.textController,
                 abrController: config.abrController,
                 playbackController: config.playbackController,
-                streamProcessor: config.streamProcessor,
                 settings: config.settings
             });
         } else {
 
             // in this case, internal buffer controller is a not fragmented text controller object
             _BufferControllerImpl = NotFragmentedTextBufferController(context).create({
-                streamId: config.streamId,
+                streamInfo: config.streamInfo,
                 type: config.type,
                 mimeType: config.mimeType,
-                errHandler: config.errHandler,
-                streamProcessor: config.streamProcessor
+                fragmentModel: config.fragmentModel,
+                errHandler: config.errHandler
             });
         }
     }
@@ -85,13 +83,8 @@ function TextBufferController(config) {
         return _BufferControllerImpl.initialize(source, StreamProcessor);
     }
 
-    /**
-     * @param {MediaInfo }mediaInfo
-     * @returns {Object} SourceBuffer object
-     * @memberof BufferController#
-     */
-    function createBuffer(mediaInfo) {
-        return _BufferControllerImpl.createBuffer(mediaInfo);
+    function createBuffer(mediaInfoArr) {
+        return _BufferControllerImpl.createBuffer(mediaInfoArr);
     }
 
     function getType() {
@@ -114,14 +107,6 @@ function TextBufferController(config) {
         _BufferControllerImpl.setMediaSource(value);
     }
 
-    function getStreamProcessor() {
-        _BufferControllerImpl.getStreamProcessor();
-    }
-
-    function setSeekStartTime(value) {
-        _BufferControllerImpl.setSeekStartTime(value);
-    }
-
     function getBufferLevel() {
         return _BufferControllerImpl.getBufferLevel();
     }
@@ -134,8 +119,8 @@ function TextBufferController(config) {
         return _BufferControllerImpl.getIsBufferingCompleted();
     }
 
-    function switchInitData(streamId, representationId) {
-        _BufferControllerImpl.switchInitData(streamId, representationId);
+    function appendInitSegment(representationId) {
+        _BufferControllerImpl.appendInitSegment(representationId);
     }
 
     function getIsPruningInProgress() {
@@ -162,8 +147,6 @@ function TextBufferController(config) {
         initialize: initialize,
         createBuffer: createBuffer,
         getType: getType,
-        getStreamProcessor: getStreamProcessor,
-        setSeekStartTime: setSeekStartTime,
         getBuffer: getBuffer,
         setBuffer: setBuffer,
         getBufferLevel: getBufferLevel,
@@ -172,7 +155,7 @@ function TextBufferController(config) {
         getIsBufferingCompleted: getIsBufferingCompleted,
         getIsPruningInProgress: getIsPruningInProgress,
         dischargePreBuffer: dischargePreBuffer,
-        switchInitData: switchInitData,
+        appendInitSegment: appendInitSegment,
         getRangeAt: getRangeAt,
         reset: reset,
         updateTimestampOffset: updateTimestampOffset
diff --git a/src/streaming/text/TextController.js b/src/streaming/text/TextController.js
index 7fc094c81b..00b5af31cf 100644
--- a/src/streaming/text/TextController.js
+++ b/src/streaming/text/TextController.js
@@ -54,19 +54,24 @@ function TextController() {
         vttParser,
         ttmlParser,
         eventBus,
-        defaultLanguage,
+        defaultSettings,
+        initialSettingsSet,
         lastEnabledIndex,
         textDefaultEnabled, // this is used for default settings (each time a file is loaded, we check value of this settings )
         allTracksAreDisabled, // this is used for one session (when a file has been loaded, we use this settings to enable/disable text)
         forceTextStreaming,
+        textTracksAdded,
+        disableTextBeforeTextTracksAdded,
         previousPeriodSelectedTrack;
 
     function setup() {
 
-        defaultLanguage = '';
+        defaultSettings = null;
         lastEnabledIndex = -1;
-        textDefaultEnabled = true;
         forceTextStreaming = false;
+        textTracksAdded = false;
+        initialSettingsSet = false;
+        disableTextBeforeTextTracksAdded = false;
         textTracks = TextTracks(context).getInstance();
         vttParser = VTTParser(context).getInstance();
         ttmlParser = TTMLParser(context).getInstance();
@@ -75,6 +80,7 @@ function TextController() {
 
         textTracks.initialize();
         eventBus.on(Events.TEXT_TRACKS_QUEUE_INITIALIZED, onTextTracksAdded, instance);
+        eventBus.on(Events.CURRENT_TRACK_CHANGED, onCurrentTrackChanged, instance);
 
         /*
         * register those event callbacks in order to detect switch of periods and set
@@ -170,27 +176,39 @@ function TextController() {
 
     function setTextDefaultLanguage(lang) {
         checkParameterType(lang, 'string');
-        defaultLanguage = lang;
+        if (!defaultSettings) {
+            defaultSettings = {};
+        }
+        defaultSettings.lang = lang;
+        initialSettingsSet = true;
+    }
+
+    function setInitialSettings(settings) {
+        defaultSettings = settings;
+        initialSettingsSet = true;
     }
 
     function getTextDefaultLanguage() {
-        return defaultLanguage;
+        return defaultSettings && defaultSettings.lang || '';
     }
 
     function onTextTracksAdded(e) {
         let tracks = e.tracks;
         let index = e.index;
 
-        tracks.some((item, idx) => {
-            if (item.lang === defaultLanguage) {
-                this.setTextTrack(idx);
-                index = idx;
-                return true;
-            }
-        });
+        if (defaultSettings) {
+            tracks.some((item, idx) => {
+                // matchSettings is compatible with setTextDefaultLanguage and setInitialSettings
+                if (mediaController.matchSettings(defaultSettings, item)) {
+                    this.setTextTrack(idx);
+                    index = idx;
+                    return true;
+                }
+            });
+        }
 
-        if (!textDefaultEnabled) {
-            // disable text at startup
+        if (textDefaultEnabled === false || ( textDefaultEnabled === undefined && !defaultSettings ) || disableTextBeforeTextTracksAdded) {
+            // disable text at startup if explicitely configured with setTextDefaultEnabled(false) or if there is no defaultSettings (configuration or from domStorage)
             this.setTextTrack(-1);
         }
 
@@ -200,6 +218,20 @@ function TextController() {
             index: index,
             tracks: tracks
         });
+        textTracksAdded = true;
+    }
+
+    function onCurrentTrackChanged(event) {
+        if (!initialSettingsSet && event && event.newMediaInfo) {
+            let mediaInfo = event.newMediaInfo;
+            if (mediaInfo.type === Constants.FRAGMENTED_TEXT) {
+                defaultSettings = {
+                    lang: mediaInfo.lang,
+                    role: mediaInfo.roles[0],
+                    accessibility: mediaInfo.accessibility[0]
+                };
+            }
+        }
     }
 
     function setTextDefaultEnabled(enable) {
@@ -209,27 +241,35 @@ function TextController() {
         if (!textDefaultEnabled) {
             // disable text at startup
             this.setTextTrack(-1);
+        } else {
+            allTracksAreDisabled = false;
         }
     }
 
     function getTextDefaultEnabled() {
-        return textDefaultEnabled;
+        return textDefaultEnabled === undefined ? false : textDefaultEnabled;
     }
 
     function enableText(enable) {
         checkParameterType(enable,'boolean');
-
+        if (!textDefaultEnabled && enable) {
+            textDefaultEnabled = true;
+        }
         if (isTextEnabled() !== enable) {
             // change track selection
             if (enable) {
-                // apply last enabled tractk
+                // apply last enabled track
                 this.setTextTrack(lastEnabledIndex);
             }
 
             if (!enable) {
                 // keep last index and disable text track
                 lastEnabledIndex = this.getCurrentTrackIdx();
-                this.setTextTrack(-1);
+                if (!textTracksAdded) {
+                    disableTextBeforeTextTracksAdded = true;
+                } else {
+                    this.setTextTrack(-1);
+                }
             }
         }
     }
@@ -242,14 +282,14 @@ function TextController() {
         return enabled;
     }
 
-    // when set to true NextFragmentRequestRule will allow schedule of chunks even if tracks are all disabled. Allowing streaming to hidden track for external players to work with.
+    // when set to true ScheduleController will allow schedule of chunks even if tracks are all disabled. Allowing streaming to hidden track for external players to work with.
     function enableForcedTextStreaming(enable) {
         checkParameterType(enable,'boolean');
         forceTextStreaming = enable;
     }
 
     function setTextTrack(idx) {
-        //For external time text file,  the only action needed to change a track is marking the track mode to showing.
+        //For external time text file, the only action needed to change a track is marking the track mode to showing.
         // Fragmented text tracks need the additional step of calling TextController.setTextTrack();
         let config = textSourceBuffer.getConfig();
         let fragmentModel = config.fragmentModel;
@@ -262,6 +302,9 @@ function TextController() {
 
         let oldTrackIdx = textTracks.getCurrentTrackIdx();
         if (oldTrackIdx !== idx) {
+            if (allTracksAreDisabled && mediaController) {
+                mediaController.saveTextSettingsDisabled();
+            }
             textTracks.setModeForTrackIdx(oldTrackIdx, Constants.TEXT_HIDDEN);
             textTracks.setCurrentTrackIdx(idx);
             textTracks.setModeForTrackIdx(idx, Constants.TEXT_SHOWING);
@@ -324,7 +367,9 @@ function TextController() {
     }
 
     function resetInitialSettings() {
-        allTracksAreDisabled = false;
+        allTracksAreDisabled = true;
+        textTracksAdded = false;
+        disableTextBeforeTextTracksAdded = false;
     }
 
     function reset() {
@@ -342,6 +387,7 @@ function TextController() {
         setTextDefaultLanguage: setTextDefaultLanguage,
         setTextDefaultEnabled: setTextDefaultEnabled,
         getTextDefaultEnabled: getTextDefaultEnabled,
+        setInitialSettings: setInitialSettings,
         enableText: enableText,
         isTextEnabled: isTextEnabled,
         setTextTrack: setTextTrack,
diff --git a/src/streaming/text/TextSourceBuffer.js b/src/streaming/text/TextSourceBuffer.js
index d89dffdf28..e6084d7ab3 100644
--- a/src/streaming/text/TextSourceBuffer.js
+++ b/src/streaming/text/TextSourceBuffer.js
@@ -98,7 +98,7 @@ function TextSourceBuffer() {
         parser = null;
     }
 
-    function initialize(mimeType, streamProcessor) {
+    function initialize(mimeType, streamInfo, mediaInfoArr, fragmentModel) {
         if (!embeddedInitialized) {
             initEmbedded();
         }
@@ -112,30 +112,29 @@ function TextSourceBuffer() {
             boxParser = BoxParser(context).getInstance();
         }
 
-        addMediaInfos(mimeType, streamProcessor);
+        addMediaInfos(mimeType, streamInfo, mediaInfoArr, fragmentModel);
     }
 
-    function addMediaInfos(mimeType, streamProcessor) {
+    function addMediaInfos(mimeType, streamInfo, mediaInfoArr, fragmentModel) {
         const isFragmented = !adapter.getIsTextTrack(mimeType);
-        if (streamProcessor) {
-            mediaInfos = mediaInfos.concat(streamProcessor.getMediaInfoArr());
-
-            if (isFragmented) {
-                fragmentedFragmentModel = streamProcessor.getFragmentModel();
-                instance.buffered = CustomTimeRanges(context).create();
-                fragmentedTracks = mediaController.getTracksFor(Constants.FRAGMENTED_TEXT, streamProcessor.getStreamInfo());
-                const currFragTrack = mediaController.getCurrentTrackFor(Constants.FRAGMENTED_TEXT, streamProcessor.getStreamInfo());
-                for (let i = 0; i < fragmentedTracks.length; i++) {
-                    if (fragmentedTracks[i] === currFragTrack) {
-                        setCurrentFragmentedTrackIdx(i);
-                        break;
-                    }
+
+        mediaInfos = mediaInfos.concat(mediaInfoArr);
+
+        if (isFragmented) {
+            fragmentedFragmentModel = fragmentModel;
+            instance.buffered = CustomTimeRanges(context).create();
+            fragmentedTracks = mediaController.getTracksFor(Constants.FRAGMENTED_TEXT, streamInfo);
+            const currFragTrack = mediaController.getCurrentTrackFor(Constants.FRAGMENTED_TEXT, streamInfo);
+            for (let i = 0; i < fragmentedTracks.length; i++) {
+                if (fragmentedTracks[i] === currFragTrack) {
+                    setCurrentFragmentedTrackIdx(i);
+                    break;
                 }
             }
+        }
 
-            for (let i = 0; i < mediaInfos.length; i++) {
-                createTextTrackFromMediaInfo(null, mediaInfos[i]);
-            }
+        for (let i = 0; i < mediaInfos.length; i++) {
+            createTextTrackFromMediaInfo(null, mediaInfos[i]);
         }
     }
 
diff --git a/src/streaming/thumbnail/ThumbnailController.js b/src/streaming/thumbnail/ThumbnailController.js
index 096d69c155..9ac5c60cae 100644
--- a/src/streaming/thumbnail/ThumbnailController.js
+++ b/src/streaming/thumbnail/ThumbnailController.js
@@ -57,12 +57,17 @@ function ThumbnailController(config) {
         });
     }
 
-    function getThumbnail(time, callback) {
+    function provideThumbnail(time, callback) {
+
+        if (typeof callback !== 'function') {
+            return;
+        }
         const track = thumbnailTracks.getCurrentTrack();
         let offset,
             request;
         if (!track || track.segmentDuration <= 0 || time === undefined || time === null) {
-            return null;
+            callback(null);
+            return;
         }
 
         // Calculate index of the sprite given a time
@@ -87,8 +92,7 @@ function ThumbnailController(config) {
         if ('readThumbnail' in track) {
             return track.readThumbnail(time, (url) => {
                 thumbnail.url = url;
-                if (callback)
-                    callback(thumbnail);
+                callback(thumbnail);
             });
         } else {
             if (!request) {
@@ -98,9 +102,7 @@ function ThumbnailController(config) {
                 thumbnail.url = request.url;
                 track.segmentDuration = NaN;
             }
-            if (callback)
-                callback(thumbnail);
-            return thumbnail;
+            callback(thumbnail);
         }
     }
 
@@ -142,7 +144,7 @@ function ThumbnailController(config) {
     }
 
     instance = {
-        get: getThumbnail,
+        provide: provideThumbnail,
         setTrackByIndex: setTrackByIndex,
         getCurrentTrackIndex: getCurrentTrackIndex,
         getBitrateList: getBitrateList,
diff --git a/src/streaming/utils/DefaultURLUtils.js b/src/streaming/utils/DefaultURLUtils.js
index 1de4be6f65..de25b9b546 100644
--- a/src/streaming/utils/DefaultURLUtils.js
+++ b/src/streaming/utils/DefaultURLUtils.js
@@ -37,6 +37,7 @@ import FactoryMaker from '../../core/FactoryMaker';
  * Initially this is simply a method to determine the Base URL of a URL, but
  * should probably include other things provided all over the place such as
  * determining whether a URL is relative/absolute, resolving two paths etc.
+ * @ignore
  */
 function DefaultURLUtils() {
 
diff --git a/test/unit/Streaming.StreamProcessor.js b/test/unit/Streaming.StreamProcessor.js
index 995bd448cd..d767d90cc2 100644
--- a/test/unit/Streaming.StreamProcessor.js
+++ b/test/unit/Streaming.StreamProcessor.js
@@ -24,52 +24,48 @@ const adapterMock = new AdapterMock();
 const eventBus = EventBus(context).getInstance();
 
 const streamInfo = {
-    streamId: 'streamId',
+    id: 'streamId',
     manifestInfo: {
         isDynamic: true
     }
 };
 
 describe('StreamProcessor', function () {
-    it('should return NaN when getIndexHandlerTime is called and streamProcessor is defined, without its attributes', function () {
-        const streamProcessor = StreamProcessor(context).create({});
-        const time = streamProcessor.getIndexHandlerTime();
+    describe('StreamProcessor not initialized', function () {
+        let streamProcessor = null;
 
-        expect(time).to.be.NaN; // jshint ignore:line
-    });
-
-    it('should not throw an error when setIndexHandlerTime is called and indexHandler is undefined', function () {
-        const streamProcessor = StreamProcessor(context).create({});
-
-        expect(streamProcessor.setIndexHandlerTime.bind(streamProcessor)).to.not.throw();
-    });
-
-    it('should return null when getInitRequest is called and indexHandler is undefined', function () {
-        const streamProcessor = StreamProcessor(context).create({});
-
-        const initRequest = streamProcessor.getInitRequest(0);
-
-        expect(initRequest).to.be.null;                // jshint ignore:line
-    });
+        beforeEach(function () {
+            streamProcessor = StreamProcessor(context).create({});
+        });
 
-    it('should throw an error when getInitRequest is called and streamProcessor is defined, but quality is not a number', function () {
-        const streamProcessor = StreamProcessor(context).create({});
+        afterEach(function () {
+            streamProcessor.reset();
+        });
 
-        expect(streamProcessor.getInitRequest.bind(streamProcessor, {})).to.be.throw(Constants.BAD_ARGUMENT_ERROR + ' : argument is not an integer');
-    });
+        it('getIndexHandlerTime should return NaN', function () {
+            const time = streamProcessor.getIndexHandlerTime();
+            expect(time).to.be.NaN; // jshint ignore:line
+        });
 
-    it('should return null when getFragmentRequest is called and without parameters', function () {
-        const streamProcessor = StreamProcessor(context).create({});
+        it('setIndexHandlerTime should not throw an error', function () {
+            expect(streamProcessor.setIndexHandlerTime.bind(streamProcessor)).to.not.throw();
+        });
 
-        const nextFragRequest = streamProcessor.getFragmentRequest();
+        it('getInitRequest should return null', function () {
+            const initRequest = streamProcessor.getInitRequest(0);
+            expect(initRequest).to.be.null; // jshint ignore:line
+        });
 
-        expect(nextFragRequest).to.be.null;                // jshint ignore:line
-    });
+        it('getInitRequest should throw an error when quality is not a number', function () {
+            expect(streamProcessor.getInitRequest.bind(streamProcessor, {})).to.be.throw(Constants.BAD_ARGUMENT_ERROR + ' : argument is not an integer');
+        });
 
-    describe('representationController parameter is properly defined, without its attributes', () => {
-        const streamProcessor = StreamProcessor(context).create({});
+        it('getFragmentRequest should return null', function () {
+            const nextFragRequest = streamProcessor.getFragmentRequest();
+            expect(nextFragRequest).to.be.null; // jshint ignore:line
+        });
 
-        it('should throw an error when getRepresentationInfo is called and representationController parameter is defined, but quality is not a number', function () {
+        it('getRepresentationInfo should throw an error when quality is not a number', function () {
             expect(streamProcessor.getRepresentationInfo.bind(streamProcessor, {})).to.be.throw(Constants.BAD_ARGUMENT_ERROR + ' : argument is not an integer');
         });
     });
@@ -91,7 +87,7 @@ describe('StreamProcessor', function () {
         let dvrInfo = dashMetricsMock.getCurrentDVRInfo();
         expect(dvrInfo).to.be.null; // jshint ignore:line
 
-        eventBus.trigger(Events.BUFFER_LEVEL_UPDATED, { sender: { getStreamProcessor() { return streamProcessor;}}, bufferLevel: 50 });
+        eventBus.trigger(Events.BUFFER_LEVEL_UPDATED, { streamId: streamInfo.id, mediaType: testType, bufferLevel: 50 });
 
         dvrInfo = dashMetricsMock.getCurrentDVRInfo();
         expect(dvrInfo).not.to.be.null; // jshint ignore:line
diff --git a/test/unit/dash.DashParser.js b/test/unit/dash.DashParser.js
index e40b3ff8f1..a67d91ab7a 100644
--- a/test/unit/dash.DashParser.js
+++ b/test/unit/dash.DashParser.js
@@ -1,4 +1,5 @@
 import DashParser from '../../src/dash/parser/DashParser';
+import DebugMock from './mocks/DebugMock';
 
 const expect = require('chai').expect;
 const fs = require('fs');
@@ -6,7 +7,7 @@ const jsdom = require('jsdom').JSDOM;
 
 const context = {};
 
-let dashParser = DashParser(context).create();
+let dashParser = DashParser(context).create({debug: new DebugMock()});
 
 describe('DashParser', function () {
 
@@ -35,4 +36,4 @@ describe('DashParser', function () {
         let manifest = fs.readFileSync(__dirname + '/data/dash/manifest_error.xml', 'utf8');
         expect(dashParser.parse.bind(manifest)).to.be.throw('parsing the manifest failed');
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/dash.models.DashManifestModel.js b/test/unit/dash.models.DashManifestModel.js
index 1ab6d4b90d..4ab6cff2fb 100644
--- a/test/unit/dash.models.DashManifestModel.js
+++ b/test/unit/dash.models.DashManifestModel.js
@@ -313,6 +313,18 @@ describe('DashManifestModel', function () {
             expect(codec).to.be.equal('video/mp4;codecs="avc1.4D400D"');    // jshint ignore:line
         });
 
+        it('should return correct codec without a correct mime type profile when getCodec is called and representationId is an integer and addResolutionInfo is false', () => {
+            const codec = dashManifestModel.getCodec({ Representation_asArray: [{mimeType: 'video/mp4 profiles="cmfc,cfhd"', codecs: 'avc1.4D400D', width: 1080, height: 960}] }, 0, false);
+
+            expect(codec).to.be.equal('video/mp4;codecs="avc1.4D400D"');    // jshint ignore:line
+        });
+
+        it('should return correct codec without an invalid mime type profile when getCodec is called and representationId is an integer and addResolutionInfo is false', () => {
+            const codec = dashManifestModel.getCodec({ Representation_asArray: [{mimeType: 'video/mp4 profiles="cmfc,cf', codecs: 'avc1.4D400D', width: 1080, height: 960}] }, 0, false);
+
+            expect(codec).to.be.equal('video/mp4;codecs="avc1.4D400D"');    // jshint ignore:line
+        });
+
         it('should return null when getMimeType is called and adaptation is undefined', () => {
             const mimeType = dashManifestModel.getMimeType();
 
@@ -738,7 +750,7 @@ describe('DashManifestModel', function () {
         });
 
         it('should not return an empty array when getRepresentationsForAdaptation is called and adaptation is defined', () => {
-            const voAdaptation = {period: {index: 0, mpd: {manifest: {Period_asArray: [{AdaptationSet_asArray: [{Representation_asArray: [{SegmentTemplate: {SegmentTimeline: {S_asArray: [{r: 2}]}}}]}]}]}}}, index: 0, type: 'video'};
+            const voAdaptation = {period: {index: 0, mpd: {manifest: {Period_asArray: [{AdaptationSet_asArray: [{Representation_asArray: [{SegmentTemplate: {SegmentTimeline: {S_asArray: [{d: 2, r: 2}]}}}]}]}]}}}, index: 0, type: 'video'};
             const representationArray = dashManifestModel.getRepresentationsForAdaptation(voAdaptation);
 
             expect(representationArray).to.be.instanceOf(Array);    // jshint ignore:line
diff --git a/test/unit/mocks/AdapterMock.js b/test/unit/mocks/AdapterMock.js
index 647e061b19..2caed88dc4 100644
--- a/test/unit/mocks/AdapterMock.js
+++ b/test/unit/mocks/AdapterMock.js
@@ -111,4 +111,4 @@ function AdapterMock () {
     };
 }
 
-export default AdapterMock;
\ No newline at end of file
+export default AdapterMock;
diff --git a/test/unit/mocks/MediaControllerMock.js b/test/unit/mocks/MediaControllerMock.js
index 2aca7b2f97..f0aa5a97e1 100644
--- a/test/unit/mocks/MediaControllerMock.js
+++ b/test/unit/mocks/MediaControllerMock.js
@@ -104,8 +104,17 @@ class MediaControllerMock {
         return (mediaInfoForType.lang === 'deu');
     }
 
+    matchSettings(settings, track) {
+        const matchRole = !settings.role || !!track.roles.filter(function (item) {
+            return item === settings.role;
+        })[0];
+        return settings.lang === track.lang && matchRole;
+    }
+
     setConfig() {}
 
+    saveTextSettingsDisabled() {}
+
     reset() {
         this.setup();
     }
diff --git a/test/unit/mocks/StreamProcessorMock.js b/test/unit/mocks/StreamProcessorMock.js
index acb00f2470..c5f44a0d6d 100644
--- a/test/unit/mocks/StreamProcessorMock.js
+++ b/test/unit/mocks/StreamProcessorMock.js
@@ -113,7 +113,7 @@ function StreamProcessorMock (testType, streamInfo) {
         return this.bufferController.getIsBufferingCompleted();
     };
 
-    this.switchInitData = function () {};
+    this.appendInitSegment = function () {};
 
     this.reset = function () {};
 }
diff --git a/test/unit/streaming.MediaPlayer.js b/test/unit/streaming.MediaPlayer.js
index c702b55910..79f3f2e291 100644
--- a/test/unit/streaming.MediaPlayer.js
+++ b/test/unit/streaming.MediaPlayer.js
@@ -873,8 +873,8 @@ describe('MediaPlayer', function () {
                 expect(player.setTextDefaultEnabled).to.throw(Constants.BAD_ARGUMENT_ERROR);
             });
 
-            it('Method getTextDefaultEnabled should return true', function () {
-                expect(player.getTextDefaultEnabled()).to.be.true; // jshint ignore:line
+            it('Method getTextDefaultEnabled should return false', function () {
+                expect(player.getTextDefaultEnabled()).to.be.false; // jshint ignore:line
             });
         });
     });
@@ -1040,6 +1040,13 @@ describe('MediaPlayer', function () {
 
                 initialSettings = player.getInitialMediaSettingsFor('audio');
                 expect(initialSettings).to.equal('settings');
+
+                player.setInitialMediaSettingsFor('fragmentedText', { lang: 'en', role: 'caption'});
+                initialSettings = player.getInitialMediaSettingsFor('fragmentedText');
+                expect(initialSettings).to.exist; ; // jshint ignore:line
+                expect(initialSettings.lang).to.equal('en');
+                expect(initialSettings.role).to.equal('caption');
+
             });
 
             it('should set current track', function () {
diff --git a/test/unit/streaming.Stream.js b/test/unit/streaming.Stream.js
index 97921f1b9d..c85010479e 100644
--- a/test/unit/streaming.Stream.js
+++ b/test/unit/streaming.Stream.js
@@ -48,25 +48,29 @@ describe('Stream', function () {
     const timelineConverter = objectsHelper.getDummyTimelineConverter();
     const streamInfo = {
         id: 'id',
-        index: 'index'
+        index: 'index',
+        manifestInfo: {
+            isDynamic: false
+        }
     };
     Events.extend(ProtectionEvents);
 
     describe('Well initialized', function () {
         beforeEach(function () {
-            stream = Stream(context).create({errHandler: errHandlerMock,
-                                             manifestModel: manifestModelMock,
-                                             adapter: adapterMock,
-                                             abrController: abrControllerMock,
-                                             manifestUpdater: manifestUpdaterMock,
-                                             playbackController: playbackControllerMock,
-                                             capabilities: capabilitiesMock,
-                                             mediaController: mediaControllerMock,
-                                             timelineConverter: timelineConverter,
-                                             dashMetrics: dashMetricsMock,
-                                             textController: textControllerMock,
-                                             videoModel: videoModelMock,
-                                             settings: settings});
+            stream = Stream(context).create({
+                errHandler: errHandlerMock,
+                manifestModel: manifestModelMock,
+                adapter: adapterMock,
+                abrController: abrControllerMock,
+                manifestUpdater: manifestUpdaterMock,
+                playbackController: playbackControllerMock,
+                capabilities: capabilitiesMock,
+                mediaController: mediaControllerMock,
+                timelineConverter: timelineConverter,
+                dashMetrics: dashMetricsMock,
+                textController: textControllerMock,
+                videoModel: videoModelMock,
+                settings: settings});
         });
 
         afterEach(function () {
@@ -76,14 +80,14 @@ describe('Stream', function () {
         it('should return false when isActive is called', () => {
             const isActive = stream.isActive();
 
-            expect(isActive).to.be.false;            // jshint ignore:line
+            expect(isActive).to.be.false; // jshint ignore:line
         });
 
         it('should return an empty array when getProcessors is called but streamProcessors attribute is an empty array', () => {
             const processors = stream.getProcessors();
 
             expect(processors).to.be.instanceOf(Array); // jshint ignore:line
-            expect(processors).to.be.empty;            // jshint ignore:line
+            expect(processors).to.be.empty; // jshint ignore:line
         });
 
         it('should trigger MANIFEST_ERROR_ID_NOSTREAMS_CODE error when setMediaSource is called but streamProcessors array is empty', () => {
@@ -100,51 +104,51 @@ describe('Stream', function () {
         it('should return an NaN when getStartTime is called but streamInfo attribute is null or undefined', () => {
             const startTime = stream.getStartTime();
 
-            expect(startTime).to.be.NaN;                // jshint ignore:line
+            expect(startTime).to.be.NaN; // jshint ignore:line
         });
 
         it('should return an NaN when getDuration is called but streamInfo attribute is null or undefined', () => {
             const duration = stream.getDuration();
 
-            expect(duration).to.be.NaN;                // jshint ignore:line
+            expect(duration).to.be.NaN; // jshint ignore:line
         });
 
         it('should return null false isMediaCodecCompatible is called but stream attribute is undefined', () => {
             const isCompatible = stream.isMediaCodecCompatible();
 
-            expect(isCompatible).to.be.false;                // jshint ignore:line
+            expect(isCompatible).to.be.false; // jshint ignore:line
         });
 
         it('should return false when isMediaCodecCompatible is called but stream attribute is an empty object', () => {
             const isCompatible = stream.isMediaCodecCompatible({});
 
-            expect(isCompatible).to.be.false;                // jshint ignore:line
+            expect(isCompatible).to.be.false; // jshint ignore:line
         });
 
         it('should return false when isMediaCodecCompatible is called with a correct stream attribute', () => {
             const isCompatible = stream.isMediaCodecCompatible(new StreamMock());
 
-            expect(isCompatible).to.be.false;                // jshint ignore:line
+            expect(isCompatible).to.be.false; // jshint ignore:line
         });
 
         it('should return null when isProtectionCompatible is called but stream attribute is undefined', () => {
             const isCompatible = stream.isProtectionCompatible();
 
-            expect(isCompatible).to.be.false;                // jshint ignore:line
+            expect(isCompatible).to.be.false; // jshint ignore:line
         });
 
         it('should return an empty array when getBitrateListFor is called but no stream processor is defined', () => {
             const bitrateList = stream.getBitrateListFor('');
 
             expect(bitrateList).to.be.instanceOf(Array); // jshint ignore:line
-            expect(bitrateList).to.be.empty;            // jshint ignore:line
+            expect(bitrateList).to.be.empty; // jshint ignore:line
         });
 
         it('should return an empty array when getBitrateListFor, for image type, is called but thumbnailController is not defined', () => {
             const bitrateList = stream.getBitrateListFor(Constants.IMAGE);
 
             expect(bitrateList).to.be.instanceOf(Array); // jshint ignore:line
-            expect(bitrateList).to.be.empty;            // jshint ignore:line
+            expect(bitrateList).to.be.empty; // jshint ignore:line
         });
 
         it('should not call STREAM_INITIALIZED event if initializeMedia has not been called when updateData is called', () => {
@@ -154,7 +158,7 @@ describe('Stream', function () {
 
             stream.updateData(streamInfo);
 
-            expect(spy.notCalled).to.be.true;                // jshint ignore:line
+            expect(spy.notCalled).to.be.true; // jshint ignore:line
 
             eventBus.off(Events.STREAM_INITIALIZED, spy);
         });
@@ -209,13 +213,13 @@ describe('Stream', function () {
 
             let isPreloaded = stream.getPreloaded();
 
-            expect(isPreloaded).to.be.false;                // jshint ignore:line
+            expect(isPreloaded).to.be.false; // jshint ignore:line
 
             stream.preload();
 
             isPreloaded = stream.getPreloaded();
 
-            expect(isPreloaded).to.be.true;                // jshint ignore:line
+            expect(isPreloaded).to.be.true; // jshint ignore:line
         });
 
         it('should return undefined when getThumbnailController is called without a call to initializeMediaForType', () => {
@@ -223,17 +227,17 @@ describe('Stream', function () {
 
             const thumbnailController = stream.getThumbnailController();
 
-            expect(thumbnailController).to.be.undefined;          // jshint ignore:line
+            expect(thumbnailController).to.be.undefined; // jshint ignore:line
         });
 
-        it('should returns an empty array when activate is called', function () {
-            stream.initialize(streamInfo, {});
+        // it('should returns an array of buffers when activate is called', function () {
+        //     stream.initialize(streamInfo, {});
 
-            const buffers = stream.activate();
+        //     const buffers = stream.activate();
 
-            expect(buffers).to.be.instanceOf(Object); // jshint ignore:line
-            expect(buffers).to.not.equal({});     // jshint ignore:line
-        });
+        //     expect(buffers).to.be.instanceOf(Object); // jshint ignore:line
+        //     expect(buffers).to.not.equal({}); // jshint ignore:line
+        // });
     });
 
     describe('Not well initialized with no config parameter', function () {
diff --git a/test/unit/streaming.controllers.BufferController.js b/test/unit/streaming.controllers.BufferController.js
index 3f4b64893b..7319ae603e 100644
--- a/test/unit/streaming.controllers.BufferController.js
+++ b/test/unit/streaming.controllers.BufferController.js
@@ -1,4 +1,3 @@
-import ObjectUtils from '../../src/streaming/utils/ObjectUtils';
 import BufferController from '../../src/streaming/controllers/BufferController';
 import EventBus from '../../src/core/EventBus';
 import Events from '../../src/core/events/Events';
@@ -7,7 +6,6 @@ import Settings from '../../src/core/Settings';
 
 import StreamControllerMock from './mocks/StreamControllerMock';
 import PlaybackControllerMock from './mocks/PlaybackControllerMock';
-import StreamProcessorMock from './mocks/StreamProcessorMock';
 import DashMetricsMock from './mocks/DashMetricsMock';
 import AdapterMock from './mocks/AdapterMock';
 import MediaSourceMock from './mocks/MediaSourceMock';
@@ -16,6 +14,7 @@ import ErrorHandlerMock from './mocks/ErrorHandlerMock';
 import MediaControllerMock from './mocks/MediaControllerMock';
 import AbrControllerMock from './mocks/AbrControllerMock';
 import TextControllerMock from './mocks/TextControllerMock';
+import RepresentationControllerMock from './mocks/RepresentationControllerMock';
 
 const chai = require('chai');
 const expect = chai.expect;
@@ -23,16 +22,16 @@ const expect = chai.expect;
 const context = {};
 const testType = 'video';
 const streamInfo = {
-    id: 'id'
+    id: 'streamId'
 };
 const eventBus = EventBus(context).getInstance();
-const objectUtils = ObjectUtils(context).getInstance();
+// const objectUtils = ObjectUtils(context).getInstance();
 const initCache = InitCache(context).getInstance();
 
 describe('BufferController', function () {
     // disable log
     let settings = Settings(context).getInstance();
-    const streamProcessor = new StreamProcessorMock(testType, streamInfo);
+    // const streamProcessor = new StreamProcessorMock(testType, streamInfo);
     const streamControllerMock = new StreamControllerMock();
     const adapterMock = new AdapterMock();
     const dashMetricsMock = new DashMetricsMock();
@@ -42,9 +41,10 @@ describe('BufferController', function () {
     const mediaControllerMock = new MediaControllerMock();
     const abrControllerMock = new AbrControllerMock();
     const textControllerMock = new TextControllerMock();
+    const representationControllerMock = new RepresentationControllerMock();
     let bufferController;
     let mediaSourceMock;
-    const mediaInfo = { codec: 'video/webm; codecs="vp8, vorbis"' };
+    const mediaInfo = [{ codec: 'video/webm; codecs="vp8, vorbis"'}];
 
     beforeEach(function () {
         global.navigator = {
@@ -53,7 +53,7 @@ describe('BufferController', function () {
 
         mediaSourceMock = new MediaSourceMock();
         bufferController = BufferController(context).create({
-            streamId: streamInfo.id,
+            streamInfo: streamInfo,
             type: testType,
             dashMetrics: dashMetricsMock,
             errHandler: errorHandlerMock,
@@ -62,7 +62,7 @@ describe('BufferController', function () {
             adapter: adapterMock,
             textController: textControllerMock,
             abrController: abrControllerMock,
-            streamProcessor: streamProcessor,
+            representationController: representationControllerMock,
             playbackController: playbackControllerMock,
             mediaPlayerModel: mediaPlayerModelMock,
             settings: settings
@@ -74,14 +74,12 @@ describe('BufferController', function () {
 
         bufferController.reset();
         bufferController = null;
-        streamProcessor.reset();
     });
 
     describe('Method initialize', function () {
         it('should initialize the controller', function () {
             expect(bufferController.getType()).to.equal(testType);
             bufferController.initialize({});
-
         });
     });
 
@@ -105,13 +103,6 @@ describe('BufferController', function () {
         });
     });
 
-    describe('Method getStreamProcessor', function () {
-        it('should return configured stream processor', function () {
-            const configuredSP = bufferController.getStreamProcessor();
-            expect(objectUtils.areEqual(configuredSP, streamProcessor)).to.be.true; // jshint ignore:line
-        });
-    });
-
     describe('Methods get/set Media Source', function () {
         it('should update media source', function () {
             bufferController.setMediaSource(mediaSourceMock);
@@ -119,7 +110,7 @@ describe('BufferController', function () {
         });
     });
 
-    describe('Method switchInitData', function () {
+    describe('Method appendInitSegment', function () {
         beforeEach(function () {
             bufferController.initialize(mediaSourceMock);
             bufferController.createBuffer(mediaInfo);
@@ -132,27 +123,20 @@ describe('BufferController', function () {
                 mediaInfo: {
                     type: 'video'
                 },
-                streamId: 'streamId',
+                streamId: streamInfo.id,
                 representationId: 'representationId'
             };
 
             initCache.save(chunk);
 
-            bufferController.switchInitData('streamId', 'representationId');
+            bufferController.appendInitSegment('representationId');
             expect(mediaSourceMock.buffers[0].chunk).to.equal(chunk.bytes);
         });
 
-        it('should trigger INIT_REQUESTED if no init data is cached', function (done) {
+        it('should return false if no init data is cached', function () {
             // reset cache
             initCache.reset();
-
-            const onInitRequest = function () {
-                eventBus.off(Events.INIT_REQUESTED, onInitRequest);
-                done();
-            };
-            eventBus.on(Events.INIT_REQUESTED, onInitRequest, this);
-
-            bufferController.switchInitData('streamId', 'representationId');
+            expect(bufferController.appendInitSegment('representationId')).to.equal(false);
         });
     });
 
@@ -203,7 +187,7 @@ describe('BufferController', function () {
         it('should append data to source buffer ', function (done) {
             const event = {
                 chunk: {
-                    streamId: 'id',
+                    streamId: streamInfo.id,
                     mediaInfo: {
                         type: 'video'
                     },
@@ -226,7 +210,7 @@ describe('BufferController', function () {
 
         it('should save init data into cache', function (done) {
             const chunk = {
-                streamId: 'id',
+                streamId: streamInfo.id,
                 mediaInfo: {
                     type: 'video'
                 },
@@ -288,7 +272,7 @@ describe('BufferController', function () {
         it('should append data to source buffer ', function (done) {
             const event = {
                 chunk: {
-                    streamId: 'id',
+                    streamId: streamInfo.id,
                     mediaInfo: {
                         type: 'video'
                     },
@@ -311,12 +295,12 @@ describe('BufferController', function () {
         it('should trigger VIDEO_CHUNK_RECEIVED if event is video', function (done) {
             const event = {
                 chunk: {
+                    streamId: streamInfo.id,
                     bytes: 'data',
                     quality: 2,
                     mediaInfo: {
                         type: 'video'
-                    },
-                    streamId: 'id'
+                    }
                 }
             };
             const onVideoChunk = function () {
@@ -334,6 +318,11 @@ describe('BufferController', function () {
         beforeEach(function () {
             bufferController.initialize(mediaSourceMock);
             bufferController.createBuffer(mediaInfo);
+            bufferController.getRepresentationInfo = function (quality) {
+                return {
+                    MSETimeOffset: quality
+                };
+            };
         });
 
         it('should not update buffer timestamp offset - wrong stream processor id', function () {
@@ -356,11 +345,11 @@ describe('BufferController', function () {
             expect(mediaSourceMock.buffers[0].timestampOffset).to.equal(1);
 
             const event = {
-                newQuality: 2,
-                mediaType: 'wrongMediaType',
                 streamInfo: {
-                    id: streamProcessor.getStreamInfo().id
-                }
+                    id: streamInfo.id
+                },
+                newQuality: 2,
+                mediaType: 'wrongMediaType'
             };
 
             // send event
@@ -369,13 +358,14 @@ describe('BufferController', function () {
         });
 
         it('should not update buffer timestamp offset - wrong quality', function () {
+
             expect(mediaSourceMock.buffers[0].timestampOffset).to.equal(1);
 
             const event = {
                 newQuality: 0,
                 mediaType: testType,
                 streamInfo: {
-                    id: streamProcessor.getStreamInfo().id
+                    id: streamInfo.id
                 }
             };
 
@@ -391,7 +381,7 @@ describe('BufferController', function () {
                 newQuality: 2,
                 mediaType: testType,
                 streamInfo: {
-                    id: streamProcessor.getStreamInfo().id
+                    id: streamInfo.id
                 }
             };
 
@@ -453,10 +443,6 @@ describe('BufferController', function () {
     describe('Method getBufferRange', function () {
         let buffer;
         beforeEach(function () {
-            let mediaInfo = {
-                codec: 'video/webm; codecs="vp8, vorbis"'
-            };
-
             bufferController.initialize(mediaSourceMock);
             bufferController.createBuffer(mediaInfo);
             const sink = bufferController.getBuffer();
diff --git a/test/unit/streaming.controllers.PlaybackControllers.js b/test/unit/streaming.controllers.PlaybackControllers.js
index c74ed0cdbf..4537543ef3 100644
--- a/test/unit/streaming.controllers.PlaybackControllers.js
+++ b/test/unit/streaming.controllers.PlaybackControllers.js
@@ -56,7 +56,6 @@ describe('PlaybackController', function () {
         it('should initialize', function () {
 
             expect(playbackController.getIsDynamic()).to.not.exist; // jshint ignore:line
-            expect(playbackController.getLiveStartTime()).to.be.NaN; // jshint ignore:line
             expect(playbackController.isPaused()).to.be.null; // jshint ignore:line
             expect(playbackController.isSeeking()).to.be.null; // jshint ignore:line
             expect(playbackController.getTime()).to.be.null; // jshint ignore:line
@@ -74,9 +73,7 @@ describe('PlaybackController', function () {
 
             playbackController.initialize(streamInfo);
 
-
             expect(playbackController.getIsDynamic()).to.equal(true);
-            expect(playbackController.getLiveStartTime()).to.equal(10);
         });
     });
 
@@ -88,14 +85,15 @@ describe('PlaybackController', function () {
                     isDynamic: true,
                     availableFrom: new Date()
                 },
-                start: 10
+                start: 10,
+                duration: 600
             };
 
             playbackController.initialize(streamInfo);
         });
 
         it('should return NaN when getLiveDelay is called after a call to computeLiveDelay with no parameter', function () {
-            expect(playbackController.computeLiveDelay.bind(playbackController)).not.to.throw();
+            expect(playbackController.computeAndSetLiveDelay.bind(playbackController)).not.to.throw();
             expect(playbackController.getLiveDelay()).to.be.NaN; // jshint ignore:line
         });
 
@@ -163,13 +161,6 @@ describe('PlaybackController', function () {
                 videoModelMock.ended = true;
                 expect(playbackController.getEnded()).to.equal(videoModelMock.ended);
             });
-
-            it('getStartTimeFromUriParameters should return the expected value', function () {
-                uriFragmentModelMock.setURIFragmentData({t: 18.2});
-                const uriParameters = playbackController.getStartTimeFromUriParameters();
-                expect(uriParameters.fragT).to.exist; // jshint ignore:line
-                expect(uriParameters.fragT).to.equal(18.2);
-            });
         });
 
         describe('video event handler', function () {
@@ -328,6 +319,186 @@ describe('PlaybackController', function () {
                 videoModelMock.fireEvent('waiting');
             });
         });
+    });
+
+    describe('start time', function () {
+        let expectedSeekTime;
+        let doneFn;
+
+        let staticStreamInfo = { manifestInfo: { isDynamic: false }, start: 10, duration: 600 };
+        let dynamicStreamInfo = { manifestInfo: { isDynamic: true }, start: 50, duration: Infinity };
+        let dvrWindowRange = { start: 70, end: 100 };
+        let liveStartTime = 85;
+
+        let onPlaybackSeeking = function (e) {
+            eventBus.off(Events.PLAYBACK_SEEKING, onPlaybackSeeking);
+            expect(e.seekTime).to.equal(expectedSeekTime);
+            doneFn();
+        };
+
+        beforeEach(function () {
+            videoModelMock.time = -1;
+            dashMetricsMock.addDVRInfo('video', Date.now(), null, dvrWindowRange);
+            eventBus.on(Events.PLAYBACK_SEEKING, onPlaybackSeeking, this);
+        });
+
+        it('should start static stream at period start', function (done) {
+            doneFn = done;
+
+            expectedSeekTime = staticStreamInfo.start;
+
+            playbackController.initialize(staticStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {});
+        });
+
+        it('should start static stream at #t', function (done) {
+            doneFn = done;
+
+            let uriStartTime = 10;
+            uriFragmentModelMock.setURIFragmentData({t: uriStartTime.toString()});
+
+            expectedSeekTime = staticStreamInfo.start + uriStartTime;
+
+            playbackController.initialize(staticStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {});
+        });
+
+        it('should start static stream at period start if #t is before period start', function (done) {
+            doneFn = done;
+
+            let uriStartTime = -10;
+            uriFragmentModelMock.setURIFragmentData({t: uriStartTime.toString()});
+
+            expectedSeekTime = staticStreamInfo.start;
+
+            playbackController.initialize(staticStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {});
+        });
+
+        it('should start static stream at period start if #t is beyond period end', function (done) {
+            doneFn = done;
+
+            let uriStartTime = staticStreamInfo.duration + 100;
+            uriFragmentModelMock.setURIFragmentData({t: uriStartTime.toString()});
+
+            expectedSeekTime = staticStreamInfo.start;
+
+            playbackController.initialize(staticStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {});
+        });
+
+        it('should start static stream at period start if #t=posix: notation is used', function (done) {
+            doneFn = done;
+
+            let uriStartTime = 10;
+            uriFragmentModelMock.setURIFragmentData({t: 'posix:' + uriStartTime.toString()});
+
+            expectedSeekTime = staticStreamInfo.start;
+
+            playbackController.initialize(staticStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {});
+        });
+
+        it('should start static stream at period start if #t= is not a valid', function (done) {
+            doneFn = done;
+
+            uriFragmentModelMock.setURIFragmentData({t: 'abcd'});
+
+            expectedSeekTime = staticStreamInfo.start;
+
+            playbackController.initialize(staticStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {});
+        });
+
+        it('should start dynamic stream at live start time', function (done) {
+            doneFn = done;
+
+            expectedSeekTime = liveStartTime;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
+
+        it('should start dynamic stream at #t', function (done) {
+            doneFn = done;
+
+            let uriStartTime = (dvrWindowRange.start - dynamicStreamInfo.start) + 10;
+            uriFragmentModelMock.setURIFragmentData({t: uriStartTime.toString()});
+
+            expectedSeekTime = dynamicStreamInfo.start + uriStartTime;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
+
+        it('should start dynamic stream at live start time if #t is before DVR window range', function (done) {
+            doneFn = done;
+
+            let uriStartTime = -10;
+            uriFragmentModelMock.setURIFragmentData({t: uriStartTime.toString()});
+
+            expectedSeekTime = dvrWindowRange.start;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
+
+        it('should start dynamic stream at live start time if #t is not valid', function (done) {
+            doneFn = done;
+
+            uriFragmentModelMock.setURIFragmentData({t: 'abcd'});
+
+            expectedSeekTime = liveStartTime;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
 
+        it('should start dynamic stream at #t=posix', function (done) {
+            doneFn = done;
+
+            let uriStartTime = dvrWindowRange.start + 10;
+            uriFragmentModelMock.setURIFragmentData({t: 'posix:' + uriStartTime.toString()});
+
+            expectedSeekTime = uriStartTime;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
+
+        it('should start dynamic stream at DVR window start if #t=posix is before DVR window range', function (done) {
+            doneFn = done;
+
+            let uriStartTime = 0;
+            uriFragmentModelMock.setURIFragmentData({t: 'posix:' + uriStartTime.toString()});
+
+            expectedSeekTime = dvrWindowRange.start;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
+
+        it('should start dynamic stream at live start time if #t=posix is beyond DVR window range', function (done) {
+            doneFn = done;
+
+            let uriStartTime = dvrWindowRange + 10;
+            uriFragmentModelMock.setURIFragmentData({t: 'posix:' + uriStartTime.toString()});
+
+            expectedSeekTime = liveStartTime;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
+
+        it('should start dynamic stream at live start time if #t=posix is not valid', function (done) {
+            doneFn = done;
+
+            uriFragmentModelMock.setURIFragmentData({t: 'posix:abcd'});
+
+            expectedSeekTime = liveStartTime;
+
+            playbackController.initialize(dynamicStreamInfo);
+            eventBus.trigger(Events.STREAM_INITIALIZED, {liveStartTime: liveStartTime});
+        });
     });
 });
diff --git a/test/unit/streaming.controllers.ScheduleController.js b/test/unit/streaming.controllers.ScheduleController.js
deleted file mode 100644
index 0b3c5cd420..0000000000
--- a/test/unit/streaming.controllers.ScheduleController.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import ScheduleController from '../../src/streaming/controllers/ScheduleController';
-import Events from '../../src/core/events/Events';
-import EventBus from '../../src/core/EventBus';
-
-import PlaybackControllerMock from './mocks/PlaybackControllerMock';
-import StreamProcessorMock from './mocks/StreamProcessorMock';
-import MediaPlayerModelMock from './mocks/MediaPlayerModelMock';
-import AbrControllerMock from './mocks/AbrControllerMock';
-import StreamControllerMock from './mocks/StreamControllerMock';
-import DashMetricsMock from './mocks/DashMetricsMock';
-import AdapterMock from './mocks/AdapterMock';
-import Settings from '../../src/core/Settings';
-
-const expect = require('chai').expect;
-const context = {};
-
-const eventBus = EventBus(context).getInstance();
-
-const streamInfo = {
-    id: 'id'
-};
-const testType = 'video';
-
-describe('ScheduleController', function () {
-
-    let scheduleController;
-    let mediaPlayerModelMock;
-    let streamProcessorMock;
-    let adapterMock;
-    let playbackControllerMock;
-    let abrControllerMock;
-    let streamControllerMock;
-    let dashMetricsMock;
-    let metricsModelMock;
-    const settings = Settings(context).getInstance();
-
-    beforeEach(function () {
-        mediaPlayerModelMock = new MediaPlayerModelMock();
-        streamProcessorMock = new StreamProcessorMock(testType, streamInfo);
-        adapterMock = new AdapterMock();
-        playbackControllerMock = new PlaybackControllerMock();
-        abrControllerMock = new AbrControllerMock();
-        streamControllerMock = new StreamControllerMock();
-        dashMetricsMock = new DashMetricsMock();
-
-        scheduleController = ScheduleController(context).create({
-            type: testType,
-            mediaPlayerModel: mediaPlayerModelMock,
-            streamProcessor: streamProcessorMock,
-            adapter: adapterMock,
-            playbackController: playbackControllerMock,
-            abrController: abrControllerMock,
-            streamController: streamControllerMock,
-            dashMetrics: dashMetricsMock,
-            metricsModel: metricsModelMock,
-            settings: settings
-        });
-
-        scheduleController.initialize();
-    });
-
-    afterEach(function () {
-        settings.reset();
-        scheduleController.reset();
-        scheduleController = null;
-    });
-
-    it('should start on STREAM_INITIALIZED event', function (done) {
-
-        let onStreamInit = function () {
-            eventBus.off(Events.STREAM_INITIALIZED, onStreamInit);
-
-            expect(scheduleController.isStarted()).to.be.true; // jshint ignore:line
-            done();
-        };
-
-        eventBus.on(Events.STREAM_INITIALIZED, onStreamInit, this);
-
-        eventBus.trigger(Events.STREAM_INITIALIZED, {
-            streamInfo: streamInfo
-        });
-    });
-
-    it('should return 12 if streamProcessor is defined and current representation is video and videoTrackPresent is true', function () {
-        const bufferTarget = scheduleController.getBufferTarget();
-        expect(bufferTarget).to.be.equal(12); // jshint ignore:line
-    });
-
-    it('should stop is controller is started', function (done) {
-
-        let onStreamInit = function () {
-            eventBus.off(Events.STREAM_INITIALIZED, onStreamInit);
-
-            expect(scheduleController.isStarted()).to.be.true; // jshint ignore:line
-
-            scheduleController.stop();
-            expect(scheduleController.isStarted()).to.be.false; // jshint ignore:line
-            done();
-        };
-
-        eventBus.on(Events.STREAM_INITIALIZED, onStreamInit, this);
-        eventBus.trigger(Events.STREAM_INITIALIZED, {
-            streamInfo: streamInfo
-        });
-    });
-});
diff --git a/test/unit/streaming.controllers.StreamController.js b/test/unit/streaming.controllers.StreamController.js
index bb1f9ce36b..53137aba28 100644
--- a/test/unit/streaming.controllers.StreamController.js
+++ b/test/unit/streaming.controllers.StreamController.js
@@ -93,32 +93,22 @@ describe('StreamController', function () {
         it('should return an empty array when attempting to call getActiveStreamProcessors while no activeStream has been defined', function () {
             const activeStreamProcessorsArray = streamController.getActiveStreamProcessors();
 
-            expect(activeStreamProcessorsArray).to.be.instanceOf(Array);    // jshint ignore:line
-            expect(activeStreamProcessorsArray).to.be.empty;                // jshint ignore:line
+            expect(activeStreamProcessorsArray).to.be.instanceOf(Array); // jshint ignore:line
+            expect(activeStreamProcessorsArray).to.be.empty; // jshint ignore:line
         });
 
-        it('should return undefined when attempting to call isTrackTypePresent with no track type', function () {
-            const isAudioTrackPresent = streamController.isTrackTypePresent();
-
-            expect(isAudioTrackPresent).to.be.undefined;    // jshint ignore:line
+        it('should return false when attempting to call hasAudioTrack, while no activeStream has been defined', function () {
+            expect(streamController.hasAudioTrack()).to.be.false; // jshint ignore:line
         });
 
-        it('should return undefined when attempting to call isTrackTypePresent, for audio type, while no activeStream has been defined', function () {
-            const isAudioTrackPresent = streamController.isTrackTypePresent('audio');
-
-            expect(isAudioTrackPresent).to.be.undefined;    // jshint ignore:line
-        });
-
-        it('should return undefined when attempting to call isTrackTypePresent, for video type, while no activeStream has been defined', function () {
-            const isVideoTrackPresent = streamController.isTrackTypePresent('video');
-
-            expect(isVideoTrackPresent).to.be.undefined;    // jshint ignore:line
+        it('should return false when attempting to call hasVideoTrack, while no activeStream has been defined', function () {
+            expect(streamController.hasVideoTrack()).to.be.false; // jshint ignore:line
         });
 
         it('should return null when attempting to call getStreamForTime, and no stream has been composed', function () {
             const stream = streamController.getStreamForTime(10);
 
-            expect(stream).to.be.null;    // jshint ignore:line
+            expect(stream).to.be.null; // jshint ignore:line
         });
     });
 
diff --git a/test/unit/streaming.controllers.XLinkController.js b/test/unit/streaming.controllers.XLinkController.js
index 4c063aae40..f2c6830bc2 100644
--- a/test/unit/streaming.controllers.XLinkController.js
+++ b/test/unit/streaming.controllers.XLinkController.js
@@ -5,6 +5,7 @@ import Events from '../../src/core/events/Events';
 import EventBus from '../../src/core/EventBus';
 
 import ErrorHandlerMock from './mocks/ErrorHandlerMock';
+import DebugMock from './mocks/DebugMock';
 
 const fs = require('fs');
 const jsdom = require('jsdom').JSDOM;
@@ -23,6 +24,7 @@ describe('XlinkController', function () {
         let urlUtils = URLUtils(context).getInstance();
         let baseUri = urlUtils.parseBaseUrl(url);
         let parser = DashParser(context).create({
+            debug: new DebugMock(),
             errorHandler: errorHandlerMock
         });
         const manifest = parser.parse(xml, xlinkController);
diff --git a/test/unit/streaming.models.BaseURLTreeModel.js b/test/unit/streaming.models.BaseURLTreeModel.js
index 446dd914fc..1d928658e7 100644
--- a/test/unit/streaming.models.BaseURLTreeModel.js
+++ b/test/unit/streaming.models.BaseURLTreeModel.js
@@ -2,6 +2,7 @@ import BaseURLTreeModel from '../../src/streaming/models/BaseURLTreeModel';
 import DashParser from '../../src/dash/parser/DashParser';
 
 import AdapterMock from './mocks/AdapterMock';
+import DebugMock from './mocks/DebugMock';
 
 const fs = require('fs');
 const chai = require('chai');
@@ -46,7 +47,7 @@ describe('BaseURLTreeModel', function () {
 
     it('should return an empty array if a test manifest is well defined', function () {
         baseURLTreeModel.setConfig({adapter: adapterMock});
-        let parser = DashParser(context).create();
+        let parser = DashParser(context).create({debug: new DebugMock()});
         let xml = fs.readFileSync(__dirname + '/data/dash/manifest.xml', 'utf8');
         const manifest = parser.parse(xml);
         expect(baseURLTreeModel.update.bind(baseURLTreeModel, manifest)).to.not.throw();
@@ -57,4 +58,4 @@ describe('BaseURLTreeModel', function () {
         expect(nodes).to.be.instanceOf(Array);    // jshint ignore:line
         expect(nodes).to.be.empty;                // jshint ignore:line
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/streaming.models.MediaPlayerModel.js b/test/unit/streaming.models.MediaPlayerModel.js
index 44a726b258..cc6925fe69 100644
--- a/test/unit/streaming.models.MediaPlayerModel.js
+++ b/test/unit/streaming.models.MediaPlayerModel.js
@@ -12,7 +12,11 @@ const expect = chai.expect;
 describe('MediaPlayerModel', function () {
     const context = {};
     const mediaPlayerModel = MediaPlayerModel(context).getInstance();
-    const settings = Settings(context).getInstance();
+    let settings = Settings(context).getInstance();
+
+    beforeEach(() => {
+        settings.reset();
+    });
 
     it('Method removeUTCTimingSource should throw an exception', function () {
         expect(mediaPlayerModel.removeUTCTimingSource.bind(mediaPlayerModel, true, 'string')).to.throw(Constants.BAD_ARGUMENT_ERROR);
@@ -44,7 +48,7 @@ describe('MediaPlayerModel', function () {
         let FragmentLoaderRetryAttempts = mediaPlayerModel.getRetryAttemptsForType(HTTPRequest.MEDIA_SEGMENT_TYPE);
         expect(FragmentLoaderRetryAttempts).to.equal(3);
 
-        const s = { streaming: { retryAttempts: {}}};
+        const s = {streaming: {retryAttempts: {}}};
         s.streaming.retryAttempts[HTTPRequest.MEDIA_SEGMENT_TYPE] = 50;
         settings.update(s);
 
@@ -53,46 +57,105 @@ describe('MediaPlayerModel', function () {
     });
 
     it('should configure FragmentLoaderRetryInterval', function () {
-        let FragmentLoaderRetryInterval =  mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MEDIA_SEGMENT_TYPE);
+        let FragmentLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MEDIA_SEGMENT_TYPE);
         expect(FragmentLoaderRetryInterval).to.equal(1000);
 
-        const s = { streaming: { retryIntervals: {}}};
+        const s = {streaming: {retryIntervals: {}}};
         s.streaming.retryIntervals[HTTPRequest.MEDIA_SEGMENT_TYPE] = 50;
         settings.update(s);
 
-        FragmentLoaderRetryInterval =  mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MEDIA_SEGMENT_TYPE);
+        FragmentLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MEDIA_SEGMENT_TYPE);
         expect(FragmentLoaderRetryInterval).to.equal(50);
     });
 
     it('should configure ManifestLoaderRetryAttempts', function () {
-        let ManifestLoaderRetryAttempts = mediaPlayerModel.getRetryAttemptsForType(HTTPRequest.MPD_TYPE);
-        expect(ManifestLoaderRetryAttempts).to.equal(3);
+        let manifestLoaderRetryAttempts = mediaPlayerModel.getRetryAttemptsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryAttempts).to.equal(3);
 
-        const s = { streaming: { retryAttempts: {}}};
+        const s = {streaming: {retryAttempts: {}}};
         s.streaming.retryAttempts[HTTPRequest.MPD_TYPE] = 50;
         settings.update(s);
 
-        ManifestLoaderRetryAttempts = mediaPlayerModel.getRetryAttemptsForType(HTTPRequest.MPD_TYPE);
-        expect(ManifestLoaderRetryAttempts).to.equal(50);
+        manifestLoaderRetryAttempts = mediaPlayerModel.getRetryAttemptsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryAttempts).to.equal(50);
+    });
+
+    it('should configure low latency retry attempt multiplication factor', function () {
+        let manifestLoaderRetryAttempts = mediaPlayerModel.getRetryAttemptsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryAttempts).to.equal(3);
+
+        const s = {
+            streaming:
+                {
+                    lowLatencyEnabled: true,
+                    retryAttempts: {
+                        lowLatencyMultiplyFactor: 10
+                    }
+                }
+        };
+        settings.update(s);
+
+        manifestLoaderRetryAttempts = mediaPlayerModel.getRetryAttemptsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryAttempts).to.equal(30);
     });
 
     it('should configure ManifestLoaderRetryInterval', function () {
-        let ManifestLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MPD_TYPE);
-        expect(ManifestLoaderRetryInterval).to.equal(500);
+        let manifestLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryInterval).to.equal(500);
 
-        const s = { streaming: { retryIntervals: {}}};
+        const s = {streaming: {retryIntervals: {}}};
         s.streaming.retryIntervals[HTTPRequest.MPD_TYPE] = 50;
         settings.update(s);
 
-        ManifestLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MPD_TYPE);
-        expect(ManifestLoaderRetryInterval).to.equal(50);
+        manifestLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryInterval).to.equal(50);
+    });
+
+    it('should configure low latency retry interval reduction factor', function () {
+        let manifestLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryInterval).to.equal(500);
+
+        const s = {
+            streaming:
+                {
+                    lowLatencyEnabled: true,
+                    retryIntervals: {
+                        lowLatencyReductionFactor: 5
+                    }
+                }
+        };
+        settings.update(s);
+
+        manifestLoaderRetryInterval = mediaPlayerModel.getRetryIntervalsForType(HTTPRequest.MPD_TYPE);
+        expect(manifestLoaderRetryInterval).to.equal(100);
     });
 
     it('should configure StableBufferTime', function () {
-        const s = { streaming: { stableBufferTime: 50 } };
+        const s = {streaming: {stableBufferTime: 50}};
         settings.update(s);
 
         let StableBufferTime = mediaPlayerModel.getStableBufferTime();
         expect(StableBufferTime).to.equal(50);
     });
-});
\ No newline at end of file
+
+    it('should configure liveCatchupLatencyThreshold', function () {
+        let liveCatchupLatencyThreshold = mediaPlayerModel.getLiveCatchupLatencyThreshold();
+        expect(liveCatchupLatencyThreshold).to.be.NaN; // jshint ignore:line
+
+        settings.update({streaming: {lowLatencyEnabled: true, liveDelay: 3, liveCatchUpMinDrift: 3}});
+
+        liveCatchupLatencyThreshold = mediaPlayerModel.getLiveCatchupLatencyThreshold();
+        expect(liveCatchupLatencyThreshold).to.equal(12);
+
+        settings.update({streaming: {liveCatchUpMinDrift: NaN}});
+
+        liveCatchupLatencyThreshold = mediaPlayerModel.getLiveCatchupLatencyThreshold();
+        expect(liveCatchupLatencyThreshold).to.equal(6);
+
+        settings.update({streaming: {liveCatchupLatencyThreshold: 50}});
+
+        liveCatchupLatencyThreshold = mediaPlayerModel.getLiveCatchupLatencyThreshold();
+        expect(liveCatchupLatencyThreshold).to.equal(50);
+    });
+
+});
diff --git a/test/unit/streaming.protection.CommonEncryption.js b/test/unit/streaming.protection.CommonEncryption.js
new file mode 100644
index 0000000000..cf5c5871ce
--- /dev/null
+++ b/test/unit/streaming.protection.CommonEncryption.js
@@ -0,0 +1,68 @@
+import CommonEncryption from '../../src/streaming/protection/CommonEncryption';
+import Base64 from '../../externals/base64';
+
+const expect = require('chai').expect;
+let cpData;
+
+describe('CommonEncryption',  () => {
+
+    beforeEach(() => {
+        cpData = {
+            'pssh': {
+                '__text': 'AAAANHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABQIARABGgZlbHV2aW8iBmVsdXZpbw=='
+            },
+            'value': 'Widevine',
+            'schemeIdUri': 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed',
+            'KID': null
+        };
+    });
+
+    describe('parseInitDataFromContentProtection', () => {
+
+        it('should return null if no init data is available in the ContentProtection element', () => {
+            cpData = {};
+            const result = CommonEncryption.parseInitDataFromContentProtection(cpData,Base64);
+
+            expect(result).to.be.null; // jshint ignore:line
+        });
+
+        it('should return base64 decoded string if init data is available in the ContentProtection element', () => {
+            const result = CommonEncryption.parseInitDataFromContentProtection(cpData,Base64);
+            const expectedByteLength = Base64.decodeArray(cpData.pssh.__text).buffer.byteLength;
+
+            expect(result.byteLength).to.equal(expectedByteLength);
+        });
+
+        it('should remove newlines and return base64 decoded string if init data is available in the ContentProtection element', () => {
+            const expectedByteLength = Base64.decodeArray(cpData.pssh.__text).buffer.byteLength;
+            cpData.pssh.__text = '\nAAAANHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABQIARABGgZlbHV2aW8iBmVsdXZpbw==\n';
+            const originalByteLength = Base64.decodeArray(cpData.pssh.__text).buffer.byteLength;
+            const result = CommonEncryption.parseInitDataFromContentProtection(cpData,Base64);
+
+            expect(originalByteLength).to.not.equal(result.byteLength);
+            expect(result.byteLength).to.equal(expectedByteLength);
+        });
+
+        it('should remove whitespaces and return base64 decoded string if init data is available in the ContentProtection element', () => {
+            const expectedByteLength = Base64.decodeArray(cpData.pssh.__text).buffer.byteLength;
+            cpData.pssh.__text = 'AAAANHBzc2gAAAAA7e+LqXnWSs6jy          Cfc1R0h7QAAABQIARABGgZlbHV2aW8iBmVsdXZpbw==';
+            const originalByteLength = Base64.decodeArray(cpData.pssh.__text).buffer.byteLength;
+            const result = CommonEncryption.parseInitDataFromContentProtection(cpData,Base64);
+
+            expect(originalByteLength).to.not.equal(result.byteLength);
+            expect(result.byteLength).to.equal(expectedByteLength);
+        });
+
+        it('should remove whitespaces and newlines and return base64 decoded string if init data is available in the ContentProtection element', () => {
+            const expectedByteLength = Base64.decodeArray(cpData.pssh.__text).buffer.byteLength;
+            cpData.pssh.__text = '\n\n\nAAAANHBzc2gAAAAA7e+LqXnWSs6jy          Cfc1R0h7QAAABQIARABGgZlbHV2aW8iBmVsdXZpbw==\n\n';
+            const originalByteLength = Base64.decodeArray(cpData.pssh.__text).buffer.byteLength;
+            const result = CommonEncryption.parseInitDataFromContentProtection(cpData,Base64);
+
+            expect(originalByteLength).to.not.equal(result.byteLength);
+            expect(result.byteLength).to.equal(expectedByteLength);
+        });
+
+    });
+
+});
diff --git a/test/unit/streaming.rules.abr.InsufficientBufferRule.js b/test/unit/streaming.rules.abr.InsufficientBufferRule.js
index cdc22eb2fb..120dcd4b17 100644
--- a/test/unit/streaming.rules.abr.InsufficientBufferRule.js
+++ b/test/unit/streaming.rules.abr.InsufficientBufferRule.js
@@ -1,13 +1,15 @@
 import InsufficientBufferRule from '../../src/streaming/rules/abr/InsufficientBufferRule';
 import SwitchRequest from '../../src/streaming/rules/SwitchRequest';
 import Constants from '../../src/streaming/constants/Constants';
-
+import EventBus from '../../src/core/EventBus.js';
+import Events from '../../src/core/events/Events';
 import DashMetricsMock from './mocks/DashMetricsMock';
 
 const expect = require('chai').expect;
 
 const context = {};
 let insufficientBufferRule;
+const eventBus = EventBus(context).getInstance();
 
 describe('InsufficientBufferRule', function () {
     beforeEach(function () {
@@ -65,7 +67,7 @@ describe('InsufficientBufferRule', function () {
         expect(maxIndexRequest.quality).to.be.equal(SwitchRequest.NO_CHANGE);
     });
 
-    it('should return an empty switch request when first call is done with a buffer in state bufferLoaded and fragmentDuration is NaN', function () {
+    it('should return an empty switch request with a buffer in state bufferLoaded and fragmentDuration is NaN', function () {
         const dashMetricsMock = new DashMetricsMock();
         let bufferState = {
             state: 'bufferLoaded'
@@ -84,7 +86,7 @@ describe('InsufficientBufferRule', function () {
         expect(maxIndexRequest.quality).to.be.equal(SwitchRequest.NO_CHANGE);
     });
 
-    it('should return index 0 when first call is done with a buffer in state bufferLoaded and fragmentDuration is NaN and then bufferStalled with fragmentDuration > 0', function () {
+    it('should return index 0 after two fragments appended with a buffer in state bufferLoaded and fragmentDuration is NaN and then bufferStalled with fragmentDuration > 0', function () {
         let bufferState = {
             state: 'bufferLoaded'
         };
@@ -103,7 +105,11 @@ describe('InsufficientBufferRule', function () {
             dashMetrics: dashMetricsMock
         });
 
-        rule.getMaxIndex(rulesContextMock);
+        let e = { mediaType: 'video', startTime: 0 };
+        eventBus.trigger(Events.BYTES_APPENDED_END_FRAGMENT, e);
+
+        e = { mediaType: 'video', startTime: 4 };//Event objects can't be reused because they get annotated by eventBus.
+        eventBus.trigger(Events.BYTES_APPENDED_END_FRAGMENT, e);
 
         bufferState.state = 'bufferStalled';
         dashMetricsMock.addBufferState('video', bufferState);
@@ -111,4 +117,37 @@ describe('InsufficientBufferRule', function () {
         const maxIndexRequest = rule.getMaxIndex(rulesContextMock);
         expect(maxIndexRequest.quality).to.be.equal(0);
     });
-});
\ No newline at end of file
+
+    it('should return index -1 for zero and one fragments appended after a seek, then index 0 afterwards when bufferStalled', function () {
+        const bufferState = {
+            state: 'bufferStalled'
+        };
+        const representationInfo = { fragmentDuration: 4 };
+        const dashMetricsMock = new DashMetricsMock();
+        dashMetricsMock.addBufferState('video', bufferState);
+
+        const rulesContextMock = {
+            getMediaInfo: function () {},
+            getMediaType: function () { return 'video'; },
+            getAbrController: function () {},
+            getRepresentationInfo: function () { return representationInfo;}
+        };
+
+        const rule = InsufficientBufferRule(context).create({
+            dashMetrics: dashMetricsMock
+        });
+
+        let maxIndexRequest = rule.getMaxIndex(rulesContextMock);
+        expect(maxIndexRequest.quality).to.be.equal(-1);
+
+        let e = { mediaType: 'video', startTime: 0 };
+        eventBus.trigger(Events.BYTES_APPENDED_END_FRAGMENT, e);
+        maxIndexRequest = rule.getMaxIndex(rulesContextMock);
+        expect(maxIndexRequest.quality).to.be.equal(-1);
+
+        e = { mediaType: 'video', startTime: 4 };
+        eventBus.trigger(Events.BYTES_APPENDED_END_FRAGMENT, e);
+        maxIndexRequest = rule.getMaxIndex(rulesContextMock);
+        expect(maxIndexRequest.quality).to.be.equal(0);
+    });
+});
diff --git a/test/unit/streaming.rules.scheduling.BufferLevelRule.js b/test/unit/streaming.rules.scheduling.BufferLevelRule.js
index 487be430e2..130a40c4bd 100644
--- a/test/unit/streaming.rules.scheduling.BufferLevelRule.js
+++ b/test/unit/streaming.rules.scheduling.BufferLevelRule.js
@@ -1,6 +1,5 @@
 import BufferLevelRule from '../../src/streaming/rules/scheduling/BufferLevelRule';
 
-import StreamProcessorMock from './mocks/StreamProcessorMock';
 import TextControllerMock from './mocks/TextControllerMock';
 import DashMetricsMock from './mocks/DashMetricsMock';
 import AbrControllerMock from './mocks/AbrControllerMock';
@@ -17,6 +16,7 @@ const bufferLevelRule = BufferLevelRule(context).create({
     dashMetrics: new DashMetricsMock(),
     abrController: new AbrControllerMock(),
     mediaPlayerModel: new MediaPlayerModelMock(),
+    hasVideoTrack: true,
     settings: settings
 });
 
@@ -26,51 +26,56 @@ describe('BufferLevelRule', function () {
     const streamInfo = {
         id: 'id'
     };
+    const representationInfo = {
+        mediaInfo: {
+            type: testAudioType,
+            streamInfo: streamInfo
+        },
+        fragmentDuration: 6
+    };
 
     afterEach(function () {
         settings.reset();
     });
 
-    it('should return NaN if streamProcessor is undefined', function () {
+    it('should return NaN if type is undefined', function () {
         const result = bufferLevelRule.getBufferTarget();
+        expect(result).to.be.NaN;  // jshint ignore:line
+    });
 
+    it('should return NaN if representationInfo is undefined', function () {
+        const result = bufferLevelRule.getBufferTarget(testAudioType);
         expect(result).to.be.NaN;  // jshint ignore:line
     });
 
     it('should return 0 if streamProcessor is defined and current representation is fragmentedText, and subtitles are disabled', function () {
-        const result = bufferLevelRule.getBufferTarget(new StreamProcessorMock(testFragmentedTextType, streamInfo));
-
+        const result = bufferLevelRule.getBufferTarget(testFragmentedTextType, representationInfo);
         expect(result).to.be.equal(0);  // jshint ignore:line
     });
 
     it('should return 6 (value returns by currentRepresentationInfo.fragmentDuration) if streamProcessor is defined and current representation is fragmentedText, and subtitles are enabled', function () {
         textControllerMock.enableText(true);
-        const result = bufferLevelRule.getBufferTarget(new StreamProcessorMock(testFragmentedTextType, streamInfo));
-
+        const result = bufferLevelRule.getBufferTarget(testFragmentedTextType, representationInfo);
         expect(result).to.be.equal(6);  // jshint ignore:line
     });
 
     it('should return 15 (value returns by getCurrentBufferLevel of DashMetricsMock) if streamProcessor is defined and current representation is audio and videoTrackPresent is true', function () {
-        const result = bufferLevelRule.getBufferTarget(new StreamProcessorMock(testAudioType, streamInfo), true);
-
+        const result = bufferLevelRule.getBufferTarget(testAudioType, representationInfo, true);
         expect(result).to.be.equal(15); // jshint ignore:line
     });
 
     it('should return 12 (DEFAULT_MIN_BUFFER_TIME of MediaPlayerModelMock) if streamProcessor is defined and current representation is audio and videoTrackPresent is false', function () {
-        const result = bufferLevelRule.getBufferTarget(new StreamProcessorMock(testAudioType, streamInfo), false);
-
+        const result = bufferLevelRule.getBufferTarget(testAudioType, representationInfo, false);
         expect(result).to.be.equal(12); // jshint ignore:line
     });
 
-    it('should return true if streamProcessor is undefined', function () {
+    it('should return true if representationInfo is undefined', function () {
         const result = bufferLevelRule.execute();
-
         expect(result).to.be.true;  // jshint ignore:line
     });
 
-    it('should return false if streamProcessor is defined', function () {
-        const result = bufferLevelRule.execute(new StreamProcessorMock(testAudioType, streamInfo));
-
+    it('should return false if representationInfo is defined', function () {
+        const result = bufferLevelRule.execute(testAudioType, representationInfo);
         expect(result).to.be.false;  // jshint ignore:line
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/streaming.rules.scheduling.NextFragmentRequestRule.js b/test/unit/streaming.rules.scheduling.NextFragmentRequestRule.js
deleted file mode 100644
index 04a3c828bb..0000000000
--- a/test/unit/streaming.rules.scheduling.NextFragmentRequestRule.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import NextFragmentRequestRule from '../../src/streaming/rules/scheduling/NextFragmentRequestRule';
-
-import TextControllerMock from './mocks/TextControllerMock';
-import StreamProcessorMock from './mocks/StreamProcessorMock';
-import PlaybackControllerMock from './mocks/PlaybackControllerMock';
-
-const expect = require('chai').expect;
-
-const context = {};
-const nextFragmentRequestRule = NextFragmentRequestRule(context).create({textController: new TextControllerMock(),
-                                                                         playbackController: new PlaybackControllerMock()});
-
-describe('NextFragmentRequestRule', function () {
-    it('should return null if streamProcessor is undefined', function () {
-        const result = nextFragmentRequestRule.execute();
-
-        expect(result).to.be.null;  // jshint ignore:line
-    });
-
-    it('should return null if streamProcessor is defined and current representation is fragmentedText, and subtitles are disabled', function () {
-        const testType = 'fragmentedText';
-        const streamInfo = {
-            id: 'id'
-        };
-        const result = nextFragmentRequestRule.execute(new StreamProcessorMock(testType, streamInfo), 1);
-
-        expect(result).to.be.null;  // jshint ignore:line
-    });
-
-    it('should return a mock request (duration of 2 seconds, and startTime of 0) if streamProcessor is defined and current representation is audio, with requestToReplace defined', function () {
-        const testType = 'audio';
-        const streamInfo = {
-            id: 'id'
-        };
-        const request = nextFragmentRequestRule.execute(new StreamProcessorMock(testType, streamInfo), 1,{startTime: 0, duration: 1});
-
-        expect(request.startTime).to.be.equal(0);  // jshint ignore:line
-        expect(request.duration).to.be.equal(2);  // jshint ignore:line
-    });
-
-    it('should return a mock request (duration of 2 seconds, and startTime of 0) if streamProcessor is defined and current representation is audio, with requestToReplace is undefined', function () {
-        const testType = 'audio';
-        const streamInfo = {
-            id: 'id'
-        };
-        const request = nextFragmentRequestRule.execute(new StreamProcessorMock(testType, streamInfo), 1);
-
-        expect(request.startTime).to.be.equal(0);  // jshint ignore:line
-        expect(request.duration).to.be.equal(2);  // jshint ignore:line
-    });
-});
\ No newline at end of file
diff --git a/test/unit/streaming.text.NotFragmentedTextBufferController.js b/test/unit/streaming.text.NotFragmentedTextBufferController.js
index 244ee688b5..b23a21423c 100644
--- a/test/unit/streaming.text.NotFragmentedTextBufferController.js
+++ b/test/unit/streaming.text.NotFragmentedTextBufferController.js
@@ -2,7 +2,6 @@ import NotFragmentedTextBufferController from '../../src/streaming/text/NotFragm
 import ObjectUtils from '../../src/streaming/utils/ObjectUtils';
 import EventBus from '../../src/core/EventBus';
 import Events from '../../src/core/events/Events';
-import InitCache from '../../src/streaming/utils/InitCache';
 
 import ErrorHandlerMock from './mocks/ErrorHandlerMock';
 import StreamProcessorMock from './mocks/StreamProcessorMock';
@@ -18,7 +17,6 @@ const streamInfo = {
 };
 const eventBus = EventBus(context).getInstance();
 const objectUtils = ObjectUtils(context).getInstance();
-const initCache = InitCache(context).getInstance();
 
 describe('NotFragmentedTextBufferController', function () {
 
@@ -26,12 +24,12 @@ describe('NotFragmentedTextBufferController', function () {
     let errorHandlerMock = new ErrorHandlerMock();
     let mediaSourceMock;
     let notFragmentedTextBufferController;
-    let mockMediaInfo = { isText: false, codec: '' };
+    let mockMediaInfoArr = [{ isText: false, codec: '' }];
 
     beforeEach(function () {
         mediaSourceMock = new MediaSourceMock();
         notFragmentedTextBufferController = NotFragmentedTextBufferController(context).create({
-            streamId: streamInfo.id,
+            streamInfo: streamInfo,
             type: testType,
             errHandler: errorHandlerMock,
             streamProcessor: streamProcessorMock
@@ -54,14 +52,14 @@ describe('NotFragmentedTextBufferController', function () {
     describe('when initialized', function () {
         describe('Method createSourceBuffer', function () {
             it('should create a sourceBuffer and initialize it', function () {
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
+                notFragmentedTextBufferController.createBuffer(mockMediaInfoArr);
                 const buffer = notFragmentedTextBufferController.getBuffer();
                 expect(buffer).to.exist; // jshint ignore:line
             });
 
             it('should notify error handler if an error occurs', function () {
                 mediaSourceMock.forceError = true;
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
+                notFragmentedTextBufferController.createBuffer(mockMediaInfoArr);
                 const buffer = notFragmentedTextBufferController.getBuffer();
                 expect(buffer).to.not.exist; // jshint ignore:line
                 expect(errorHandlerMock.errorValue).to.equal('Error creating source buffer of type : ' + testType);
@@ -77,18 +75,12 @@ describe('NotFragmentedTextBufferController', function () {
 
         describe('Method getBuffer', function () {
             it('should return created buffer', function () {
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
+                notFragmentedTextBufferController.createBuffer(mockMediaInfoArr);
                 let buffer = notFragmentedTextBufferController.getBuffer().getBuffer();
                 expect(objectUtils.areEqual(buffer, mediaSourceMock.buffers[0])).to.be.true; // jshint ignore:line
             });
         });
 
-        describe('Method getStreamProcessor', function () {
-            it('should return streamProcessor', function () {
-                let sp = notFragmentedTextBufferController.getStreamProcessor();
-                expect(objectUtils.areEqual(sp, streamProcessorMock)).to.be.true; // jshint ignore:line
-            });
-        });
 
         describe('Method getBufferLevel', function () {
             it('should return 0', function () {
@@ -106,7 +98,7 @@ describe('NotFragmentedTextBufferController', function () {
 
         describe('Method reset', function () {
             beforeEach(function () {
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
+                notFragmentedTextBufferController.createBuffer(mockMediaInfoArr);
             });
 
             it('should not abort buffer if there is an error', function () {
@@ -133,57 +125,26 @@ describe('NotFragmentedTextBufferController', function () {
             });
         });
 
-        describe('Method switchInitData', function () {
-            it('should not append init data to source buffer if data have already been cached', function () {
-                let chunk = {
-                    bytes: 'initData',
-                    quality: 2,
-                    mediaInfo: {
-                        type: testType
-                    },
-                    streamId: 'streamId',
-                    representationId: 'representationId'
-                };
-
-                initCache.save(chunk);
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
-                const buffer = notFragmentedTextBufferController.getBuffer().getBuffer();
-                notFragmentedTextBufferController.switchInitData(chunk.streamId, chunk.representationId);
-                expect(buffer.chunk).to.equal(null);
-            });
-
-            it('should trigger TIMED_TEXT_REQUESTED if no init data is cached', function (done) {
-
-                // reset cache
-                initCache.reset();
-
-                let onInitRequest = function () {
-                    eventBus.off(Events.TIMED_TEXT_REQUESTED, onInitRequest);
-                    done();
-                };
-                eventBus.on(Events.TIMED_TEXT_REQUESTED, onInitRequest, this);
-
-                notFragmentedTextBufferController.switchInitData('streamId', 'representationId');
-            });
-        });
-
         describe('Event DATA_UPDATE_COMPLETED Handler', function () {
 
-            it('should trigger TIMED_TEXT_REQUESTED', function (done) {
+            it('should trigger INIT_FRAGMENT_NEEDED', function (done) {
 
                 let event = {
                     sender: {
                         getType: function () { return testType; },
                         getStreamId: function () { return streamInfo.id; },
                         getCurrentRepresentation: function () { return { id: 0}; }
-                    }
+                    },
+                    streamId: streamInfo.id,
+                    mediaType: testType,
+                    currentRepresentation: { id: 0}
                 };
 
                 let onEvent = function () {
-                    eventBus.off(Events.TIMED_TEXT_REQUESTED, onEvent);
+                    eventBus.off(Events.INIT_FRAGMENT_NEEDED, onEvent);
                     done();
                 };
-                eventBus.on(Events.TIMED_TEXT_REQUESTED, onEvent, this);
+                eventBus.on(Events.INIT_FRAGMENT_NEEDED, onEvent, this);
                 eventBus.trigger(Events.DATA_UPDATE_COMPLETED, event);
             });
         });
@@ -192,7 +153,7 @@ describe('NotFragmentedTextBufferController', function () {
 
             it('should not append data to buffer - wrong stream id', function (done) {
 
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
+                notFragmentedTextBufferController.createBuffer(mockMediaInfoArr);
                 const buffer = notFragmentedTextBufferController.getBuffer().getBuffer();
 
                 let event = {
@@ -217,7 +178,7 @@ describe('NotFragmentedTextBufferController', function () {
 
             it('should not append data to buffer - no bytes', function (done) {
 
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
+                notFragmentedTextBufferController.createBuffer(mockMediaInfoArr);
                 const buffer = notFragmentedTextBufferController.getBuffer().getBuffer();
 
                 let event = {
@@ -240,7 +201,7 @@ describe('NotFragmentedTextBufferController', function () {
             });
 
             it('should append data to buffer', function (done) {
-                notFragmentedTextBufferController.createBuffer(mockMediaInfo);
+                notFragmentedTextBufferController.createBuffer(mockMediaInfoArr);
                 const buffer = notFragmentedTextBufferController.getBuffer().getBuffer();
                 let event = {
                     chunk: {
diff --git a/test/unit/streaming.text.TextController.js b/test/unit/streaming.text.TextController.js
index c2cc2a7101..1bc727230f 100644
--- a/test/unit/streaming.text.TextController.js
+++ b/test/unit/streaming.text.TextController.js
@@ -8,6 +8,8 @@ import Constants from '../../src/streaming/constants/Constants';
 
 import VideoModelMock from './mocks/VideoModelMock';
 import StreamControllerMock from './mocks/StreamControllerMock';
+import MediaControllerMock from './mocks/MediaControllerMock';
+
 
 const expect = require('chai').expect;
 const context = {};
@@ -19,6 +21,7 @@ describe('TextController', function () {
 
     let videoModelMock = new VideoModelMock();
     let streamControllerMock = new StreamControllerMock();
+    let mediaControllerMock = new MediaControllerMock();
     let textTracks;
     let textController;
 
@@ -37,7 +40,9 @@ describe('TextController', function () {
     });
 
     afterEach(function () {
-        delete global.document;
+        if (typeof window !== 'undefined' && global !== window) {
+            delete global.document;
+        }
     });
 
     beforeEach(function () {
@@ -49,7 +54,8 @@ describe('TextController', function () {
         textController = TextController(context).getInstance();
         textController.setConfig({
             videoModel: videoModelMock,
-            streamController: streamControllerMock
+            streamController: streamControllerMock,
+            mediaController: mediaControllerMock
         });
     });
 
@@ -84,10 +90,10 @@ describe('TextController', function () {
     describe('Method setTextDefaultEnabled', function () {
         it('should not set text default enabled if enable is not a boolean', function () {
             expect(textController.setTextDefaultEnabled.bind(textController, -1)).to.throw(Constants.BAD_ARGUMENT_ERROR);
-            expect(textController.getTextDefaultEnabled()).to.equal(true); // jshint ignore:line
+            expect(textController.getTextDefaultEnabled()).to.equal(false); // jshint ignore:line
 
             expect(textController.setTextDefaultEnabled.bind(textController)).to.throw(Constants.BAD_ARGUMENT_ERROR);
-            expect(textController.getTextDefaultEnabled()).to.equal(true); // jshint ignore:line
+            expect(textController.getTextDefaultEnabled()).to.equal(false); // jshint ignore:line
         });
 
         it('should set text default enabled if enable is a boolean', function () {
@@ -144,13 +150,13 @@ describe('TextController', function () {
         it('should enable/disable text', function () {
 
             let textEnabled = textController.isTextEnabled();
-            expect(textEnabled).to.equal(true); // jshint ignore:line
-
-            textController.enableText(false);
-            expect(textController.isTextEnabled()).to.equal(false); // jshint ignore:line
+            expect(textEnabled).to.equal(false); // jshint ignore:line
 
             textController.enableText(true);
             expect(textController.isTextEnabled()).to.equal(true); // jshint ignore:line
+
+            textController.enableText(false);
+            expect(textController.isTextEnabled()).to.equal(false); // jshint ignore:line
         });
     });
 
@@ -208,17 +214,24 @@ describe('TextController', function () {
 
             textTracksQueue.push({
                 index: 0,
-                kind: 'subtitles',
+                roles: ['subtitles'],
                 label: 'sub_en',
                 lang: 'eng'
             });
 
             textTracksQueue.push({
                 index: 1,
-                kind: 'subtitles',
+                roles: ['subtitles'],
                 label: 'sub_fr',
                 lang: 'fr'
             });
+
+            textTracksQueue.push({
+                index: 2,
+                roles: ['captions'],
+                label: 'sub_fr_hoh',
+                lang: 'fr'
+            });
         });
 
         it('should send TEXT_TRACKS_ADDED event', function (done) {
@@ -242,7 +255,7 @@ describe('TextController', function () {
             eventBus.trigger(Events.TEXT_TRACKS_QUEUE_INITIALIZED, event);
         });
 
-        it('should choose langauge according to default language', function (done) {
+        it('should choose language according to default language', function (done) {
             // init test
             textController.setTextDefaultLanguage('fr');
 
@@ -282,6 +295,26 @@ describe('TextController', function () {
             // send event
             eventBus.trigger(Events.TEXT_TRACKS_QUEUE_INITIALIZED, event);
         });
+
+        it('should choose track according to default settings', function (done) {
+            // init test
+            textController.setInitialSettings({ lang: 'fr', role: 'captions' });
+
+            const event = {
+                index: initialIndex,
+                tracks: textTracksQueue
+            };
+            const onTracksAdded = function (e) {
+                expect(e.index).to.equal(2); // jshint ignore:line
+                expect(e.tracks.length).to.equal(textTracksQueue.length); // jshint ignore:line
+                eventBus.off(Events.TEXT_TRACKS_ADDED, onTracksAdded, this);
+                done();
+            };
+            eventBus.on(Events.TEXT_TRACKS_ADDED, onTracksAdded, this);
+
+            // send event
+            eventBus.trigger(Events.TEXT_TRACKS_QUEUE_INITIALIZED, event);
+        });
     });
 
 });
diff --git a/test/unit/streaming.text.TextSourceBuffer.js b/test/unit/streaming.text.TextSourceBuffer.js
index db00b5122b..026f71473e 100644
--- a/test/unit/streaming.text.TextSourceBuffer.js
+++ b/test/unit/streaming.text.TextSourceBuffer.js
@@ -23,17 +23,9 @@ describe('TextSourceBuffer', function () {
                                 errHandler: errorHandlerMock,
                                 ttmlParser: ttmlParser});
 
-    it('call to addEmbeddedTrack function with no mediaInfo parameter should not throw an error', function () {
-        expect(textSourceBuffer.addEmbeddedTrack.bind(textSourceBuffer)).to.not.throw();
-    });
-
-    it('call to initialize function with no streamProcessor parameter should not throw an error', function () {
-        expect(textSourceBuffer.initialize.bind(textSourceBuffer, 'mimeType')).to.not.throw();
-    });
-
     it('call to append function with invalid tttml data should triggered a parse error', function () {
         const buffer = new ArrayBuffer(8);
         textSourceBuffer.append(buffer, {mediaInfo: {type: 'text', mimeType: 'application/ttml+xml', codec: 'application/ttml+xml;codecs=\'undefined\''}});
         expect(errorHandlerMock.errorCode).to.equal(Errors.TIMED_TEXT_ERROR_ID_PARSE_CODE);
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/streaming.thumbnail.ThumbnailController.js b/test/unit/streaming.thumbnail.ThumbnailController.js
index 9ccbc5d9e7..fa889de588 100644
--- a/test/unit/streaming.thumbnail.ThumbnailController.js
+++ b/test/unit/streaming.thumbnail.ThumbnailController.js
@@ -86,8 +86,9 @@ describe('Thumbnails', function () {
         });
 
         it('should return null if not initialized', function () {
-            const thumbnail = thumbnailController.get(0);
-            expect(thumbnail).to.be.null; // jshint ignore:line
+            thumbnailController.provide(0, (thumbnail) => {
+                expect(thumbnail).to.be.null; // jshint ignore:line
+            });
 
             expect(thumbnailController.getBitrateList()).to.be.empty; // jshint ignore:line
         });
@@ -116,10 +117,11 @@ describe('Thumbnails', function () {
         });
 
         it('should return a thumbnail', function () {
-            let thumbnail = thumbnailController.get();
-            expect(thumbnail).to.be.null; // jshint ignore:line
+            thumbnailController.provide(undefined, thumbnail => {
+                expect(thumbnail).to.be.null; // jshint ignore:line
+            });
 
-            thumbnailController.get(0, thumbnail => {
+            thumbnailController.provide(0, thumbnail => {
                 expect(thumbnail).to.be.not.null; // jshint ignore:line
                 expect(thumbnail.x).to.equal(0);
                 expect(thumbnail.y).to.equal(0);
@@ -128,7 +130,7 @@ describe('Thumbnails', function () {
                 expect(thumbnail.url).to.equal('http://media/rep_id/1.jpg');
             });
 
-            thumbnailController.get(11, thumbnail => {
+            thumbnailController.provide(11, thumbnail => {
                 expect(thumbnail).to.be.not.null; // jshint ignore:line
                 expect(thumbnail.x).to.equal(320);
                 expect(thumbnail.y).to.equal(0);
@@ -137,7 +139,7 @@ describe('Thumbnails', function () {
                 expect(thumbnail.url).to.equal('http://media/rep_id/1.jpg');
             });
 
-            thumbnailController.get(101, thumbnail => {
+            thumbnailController.provide(101, thumbnail => {
                 expect(thumbnail).to.be.not.null; // jshint ignore:line
                 expect(thumbnail.x).to.equal(0);
                 expect(thumbnail.y).to.equal(0);
@@ -149,7 +151,7 @@ describe('Thumbnails', function () {
 
         it('shouldn\'t return any thumbnail after reset', function () {
             thumbnailController.reset();
-            thumbnailController.get(0, thumbnail => {
+            thumbnailController.provide(0, thumbnail => {
                 expect(thumbnail).to.be.null; // jshint ignore:line
             });
         });
@@ -191,7 +193,7 @@ describe('Thumbnails', function () {
         });
 
         it('should return a thumbnail when using multiple rows sprites ', function () {
-            thumbnailController.get(0, thumbnail => {
+            thumbnailController.provide(0, thumbnail => {
                 expect(thumbnail).to.be.not.null; // jshint ignore:line
                 expect(thumbnail.x).to.equal(0);
                 expect(thumbnail.y).to.equal(0);
@@ -201,7 +203,7 @@ describe('Thumbnails', function () {
             });
 
 
-            thumbnailController.get(15, thumbnail => {
+            thumbnailController.provide(15, thumbnail => {
                 expect(thumbnail).to.be.not.null; // jshint ignore:line
                 expect(thumbnail.x).to.equal(409.6);
                 expect(thumbnail.y).to.equal(0);
@@ -210,7 +212,7 @@ describe('Thumbnails', function () {
                 expect(thumbnail.url).to.equal('http://media/rep_id/1.jpg');
             });
 
-            thumbnailController.get(40, thumbnail => {
+            thumbnailController.provide(40, thumbnail => {
                 expect(thumbnail).to.be.not.null; // jshint ignore:line
                 expect(thumbnail.x).to.equal(204.8);
                 expect(thumbnail.y).to.equal(57.6);