diff --git a/.mergify.yml b/.mergify.yml
index e1c3ce5c317..ce9a8d9bed3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,7 +4,6 @@ pull_request_rules:
       - base=master
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
-      - "#review-requested=0"
       - status-success=lint_test_build
       - label=ready-to-merge
       - label!=do-not-merge
diff --git a/CODEOWNERS b/CODEOWNERS
index 9346e34a48e..85cf5ae4428 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,40 +1,42 @@
 # Default
-*                                           @box/webapp
+*                                               @box/webapp
 
 # Root
-/*                                          @box/foundation @box/webapp
-/LICENSE                                    @box/ui-elements
-/scripts/                                   @box/foundation @box/webapp
-/THIRD_PARTY_LICENSES                       @box/ui-elements
+/*                                              @box/foundation
+/LICENSE                                        @box/ui-elements
+/THIRD_PARTY_LICENSES                           @box/ui-elements
+
+# Build
+/scripts/                                       @box/foundation
 
 # Source
-/src/                                       @box/foundation @box/webapp
-/src/*                                      @box/create-communicate @box/preview @box/ui-elements
-/src/api/                                   @box/create-communicate @box/preview @box/ui-elements
-/src/api/Feed.js                            @box/collab @box/preview
-/src/api/box-edit/                          @box/partners
-/src/api/tasks                              @box/collab @box/preview
-/src/elements/                              @box/create-communicate @box/preview @box/ui-elements
-/src/elements/content-explorer/             @box/ui-elements
-/src/elements/content-open-with/            @box/partners
-/src/elements/content-picker/               @box/ui-elements
-/src/elements/content-preview/              @box/preview
-/src/elements/content-sidebar/              @box/preview
-/src/elements/content-sidebar/activity-feed @box/collab @box/preview
-/src/elements/content-uploader/             @box/create-communicate
-/src/elements/wrappers/                     @box/ui-elements
-/src/features/                              @box/webapp
-/src/features/access-stats/                 @box/preview
-/src/features/item-details/                 @box/preview
-/src/features/metadata-based-view/          @box/ui-elements
-/src/features/metadata-instance-editor/     @box/ui-elements
+/src/                                           @box/webapp
+/src/*                                          @box/create-communicate @box/ui-elements
+/src/api/                                       @box/create-communicate @box/ui-elements
+/src/api/Feed.js                                @box/collab @box/preview
+/src/api/box-edit/                              @box/partners
+/src/api/tasks/                                 @box/collab @box/preview
+/src/elements/                                  @box/create-communicate @box/ui-elements
+/src/elements/content-explorer/                 @box/ui-elements
+/src/elements/content-open-with/                @box/partners
+/src/elements/content-picker/                   @box/ui-elements
+/src/elements/content-preview/                  @box/preview
+/src/elements/content-sidebar/                  @box/preview
+/src/elements/content-sidebar/activity-feed/    @box/collab @box/preview
+/src/elements/content-uploader/                 @box/create-communicate
+/src/elements/wrappers/                         @box/ui-elements
+/src/features/                                  @box/webapp
+/src/features/access-stats/                     @box/preview
+/src/features/item-details/                     @box/preview
+/src/features/metadata-based-view/              @box/ui-elements
+/src/features/metadata-instance-editor/         @box/ui-elements
 
 # Tests
-/test/                                      @box/foundation @box/webapp
-/test/integration/                          @box/webapp
-/test/integration/content-explorer/         @box/ui-elements
-/test/integration/content-open-with/        @box/partners
-/test/integration/content-picker/           @box/ui-elements
-/test/integration/content-preview/          @box/preview
-/test/integration/content-sidebar/          @box/preview
-/test/integration/content-uploader/         @box/create-communicate
+/test/                                          @box/webapp
+/test/integration/                              @box/webapp
+/test/integration/content-explorer/             @box/ui-elements
+/test/integration/content-open-with/            @box/partners
+/test/integration/content-picker/               @box/ui-elements
+/test/integration/content-preview/              @box/preview
+/test/integration/content-sidebar/              @box/preview
+/test/integration/content-uploader/             @box/create-communicate