diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa61845ebd..db61553ecc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -707,9 +707,11 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     - *step-depot-tools-add-to-path
     - *step-setup-env-for-build
     - *step-restore-brew-cache
+    - *step-get-more-space-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync-on-mac
     - *step-gn-gen-default
+    - *step-delete-git-directories
 
     # Electron app
     - *step-electron-build
@@ -1222,6 +1224,15 @@ jobs:
       <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
+  osx-debug:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+    <<: *steps-electron-build-for-tests    
+
   osx-debug-gn-check:
     <<: *machine-mac
     environment:
@@ -1272,6 +1283,16 @@ jobs:
       <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
+  mas-debug:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-mas
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+    <<: *steps-electron-build-for-tests
+
   mas-debug-gn-check:
     <<: *machine-mac
     environment:
@@ -1645,9 +1666,14 @@ workflows:
           requires:
             - mac-checkout
 
+      - osx-debug:
+          requires:
+            - mac-checkout
+
       - osx-debug-gn-check:
           requires:
             - mac-checkout
+
       - osx-testing-gn-check:
           requires:
             - mac-checkout
@@ -1660,9 +1686,14 @@ workflows:
           requires:
             - mac-checkout
 
+      - mas-debug:
+          requires:
+            - mac-checkout
+
       - mas-debug-gn-check:
           requires:
             - mac-checkout
+
       - mas-testing-gn-check:
           requires:
             - mac-checkout
diff --git a/BUILD.gn b/BUILD.gn
index 7d29ab9a00..90bd0ff2d1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -582,9 +582,7 @@ source_set("electron_lib") {
   }
 
   if (enable_desktop_capturer) {
-    if (is_component_build && is_win) {
-      # On windows the implementation relies on unexported
-      # DxgiDuplicatorController class.
+    if (is_component_build && !is_linux) {
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
     sources += [