Merge branch 'v3-stable' into customizable-TS

extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.tsx

@@ -335,13 +335,13 @@ const OHIFCornerstoneViewport = React.memo(props => {
 
       cleanUpServices();
 
+      const viewportInfo = cornerstoneViewportService.getViewportInfoByIndex(
+        viewportIndex
+      );
+
       cornerstoneViewportService.disableElement(viewportIndex);
 
       if (onElementDisabled) {
-        const viewportInfo = cornerstoneViewportService.getViewportInfoByIndex(
-          viewportIndex
-        );
-
         onElementDisabled(viewportInfo);
       }
 

extensions/cornerstone/src/initWADOImageLoader.js

@@ -61,8 +61,8 @@ export default function initWADOImageLoader(
 
       const xhrRequestHeaders = {}
 
-      if (headers && headers.Authorization) {
-        xhrRequestHeaders.Authorization = headers.Authorization;
+      if (headers) {
+        Object.assign(xhrRequestHeaders, headers);
       }
 
       return xhrRequestHeaders;