diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81f6beaae83c..6ad7d0879d40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,8 +27,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
-        - fix-ci-deps
-        - issue-23843_electron_21_upgrade
+        - issue-7306
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
diff --git a/cli/types/cypress.d.ts b/cli/types/cypress.d.ts
index 14a837d82cc9..d1899b48b84c 100644
--- a/cli/types/cypress.d.ts
+++ b/cli/types/cypress.d.ts
@@ -49,6 +49,9 @@ declare namespace Cypress {
   interface CommandFnWithOriginalFnAndSubject<T extends keyof Chainable, S> {
     (this: Mocha.Context, originalFn: CommandOriginalFnWithSubject<T, S>, prevSubject: S, ...args: Parameters<ChainableMethods[T]>): ReturnType<ChainableMethods[T]> | void
   }
+  interface QueryFn<T extends keyof ChainableMethods> {
+    (...args: Parameters<ChainableMethods[T]>): (subject: any) => any
+  }
   interface ObjectLike {
     [key: string]: any
   }
@@ -462,30 +465,92 @@ declare namespace Cypress {
      */
     log(options: Partial<LogConfig>): Log
 
-    /**
-     * @see https://on.cypress.io/api/commands
-     */
     Commands: {
+      /**
+       * Add a custom command
+       * @see https://on.cypress.io/api/commands
+       */
       add<T extends keyof Chainable>(name: T, fn: CommandFn<T>): void
+
+      /**
+       * Add a custom parent command
+       * @see https://on.cypress.io/api/commands#Parent-Commands
+       */
       add<T extends keyof Chainable>(name: T, options: CommandOptions & {prevSubject: false}, fn: CommandFn<T>): void
+
+      /**
+       * Add a custom child command
+       * @see https://on.cypress.io/api/commands#Child-Commands
+       */
       add<T extends keyof Chainable, S = any>(name: T, options: CommandOptions & {prevSubject: true}, fn: CommandFnWithSubject<T, S>): void
+
+      /**
+       * Add a custom child or dual command
+       * @see https://on.cypress.io/api/commands#Validations
+       */
       add<T extends keyof Chainable, S extends PrevSubject>(
           name: T, options: CommandOptions & { prevSubject: S | ['optional'] }, fn: CommandFnWithSubject<T, PrevSubjectMap[S]>,
       ): void
+
+      /**
+       * Add a custom command that allows multiple types as the prevSubject
+       * @see https://on.cypress.io/api/commands#Validations#Allow-Multiple-Types
+       */
       add<T extends keyof Chainable, S extends PrevSubject>(
           name: T, options: CommandOptions & { prevSubject: S[] }, fn: CommandFnWithSubject<T, PrevSubjectMap<void>[S]>,
       ): void
+
+      /**
+       * Add one or more custom commands
+       * @see https://on.cypress.io/api/commands
+       */
       addAll<T extends keyof Chainable>(fns: CommandFns): void
+
+      /**
+       * Add one or more custom parent commands
+       * @see https://on.cypress.io/api/commands#Parent-Commands
+       */
       addAll<T extends keyof Chainable>(options: CommandOptions & {prevSubject: false}, fns: CommandFns): void
+
+      /**
+       * Add one or more custom child commands
+       * @see https://on.cypress.io/api/commands#Child-Commands
+       */
       addAll<T extends keyof Chainable, S = any>(options: CommandOptions & { prevSubject: true }, fns: CommandFnsWithSubject<S>): void
+
+      /**
+       * Add one or more custom commands that validate their prevSubject
+       * @see https://on.cypress.io/api/commands#Validations
+       */
       addAll<T extends keyof Chainable, S extends PrevSubject>(
           options: CommandOptions & { prevSubject: S | ['optional'] }, fns: CommandFnsWithSubject<PrevSubjectMap[S]>,
       ): void
+
+      /**
+       * Add one or more custom commands that allow multiple types as their prevSubject
+       * @see https://on.cypress.io/api/commands#Allow-Multiple-Types
+       */
       addAll<T extends keyof Chainable, S extends PrevSubject>(
           options: CommandOptions & { prevSubject: S[] }, fns: CommandFnsWithSubject<PrevSubjectMap<void>[S]>,
       ): void
+
+      /**
+       * Overwrite an existing Cypress command with a new implementation
+       * @see https://on.cypress.io/api/commands#Overwrite-Existing-Commands
+       */
       overwrite<T extends keyof Chainable>(name: T, fn: CommandFnWithOriginalFn<T>): void
+
+      /**
+       * Overwrite an existing Cypress command with a new implementation
+       * @see https://on.cypress.io/api/commands#Overwrite-Existing-Commands
+       */
       overwrite<T extends keyof Chainable, S extends PrevSubject>(name: T, fn: CommandFnWithOriginalFnAndSubject<T, PrevSubjectMap[S]>): void
+
+      /**
+       * Add a custom query
+       * @see https://on.cypress.io/api/commands#Queries
+       */
+      addQuery<T extends keyof Chainable>(name: T, fn: QueryFn<T>): void
     }
 
     /**
diff --git a/packages/app/cypress/e2e/specs_list_e2e.cy.ts b/packages/app/cypress/e2e/specs_list_e2e.cy.ts
index f66467d8fb2c..ba8279d2460e 100644
--- a/packages/app/cypress/e2e/specs_list_e2e.cy.ts
+++ b/packages/app/cypress/e2e/specs_list_e2e.cy.ts
@@ -245,8 +245,7 @@ describe('App: Spec List (E2E)', () => {
         cy.findByText('No specs matched your search:').should('not.be.visible')
       })
 
-      // TODO: fix flaky test https://github.com/cypress-io/cypress/issues/23305
-      it.skip('saves the filter when navigating to a spec and back', function () {
+      it('saves the filter when navigating to a spec and back', function () {
         const targetSpecFile = 'accounts_list.spec.js'
 
         clearSearchAndType(targetSpecFile)
diff --git a/packages/app/cypress/e2e/top-nav.cy.ts b/packages/app/cypress/e2e/top-nav.cy.ts
index e65a10d484f7..ebb3bc16f31f 100644
--- a/packages/app/cypress/e2e/top-nav.cy.ts
+++ b/packages/app/cypress/e2e/top-nav.cy.ts
@@ -195,7 +195,7 @@ describe('App Top Nav Workflows', () => {
       })
 
       it('hides dropdown when version in header is clicked', () => {
-        cy.findByTestId('cypress-update-popover').findByRole('button', { expanded: false }).as('topNavVersionButton').click()
+        cy.findByTestId('cypress-update-popover').findAllByRole('button').first().as('topNavVersionButton').click()
 
         cy.get('@topNavVersionButton').should('have.attr', 'aria-expanded', 'true')
 
@@ -541,7 +541,7 @@ describe('App Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
 
             cy.contains('http://127.0.0.1:0000/redirect-to-auth').should('be.visible')
@@ -573,7 +573,7 @@ describe('App Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
 
             cy.contains(loginText.titleFailed).should('be.visible')
@@ -623,7 +623,7 @@ describe('App Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).as('loginButton').click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
 
             cy.contains(loginText.titleFailed).should('be.visible')
@@ -660,7 +660,7 @@ describe('App Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).as('loginButton').click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
             cy.contains(loginText.titleFailed).should('be.visible')
             cy.contains(loginText.bodyError).should('be.visible')
diff --git a/packages/app/package.json b/packages/app/package.json
index 31f139565be4..ae42c2329b63 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -28,7 +28,7 @@
     "@intlify/vite-plugin-vue-i18n": "2.4.0",
     "@packages/frontend-shared": "0.0.0-development",
     "@percy/cypress": "^3.1.0",
-    "@testing-library/cypress": "8.0.0",
+    "@testing-library/cypress": "BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5",
     "@types/faker": "5.5.8",
     "@urql/core": "2.4.4",
     "@urql/vue": "0.6.2",
diff --git a/packages/driver/cypress/e2e/commands/actions/check.cy.js b/packages/driver/cypress/e2e/commands/actions/check.cy.js
index 49a37886a623..8d0885a8e4eb 100644
--- a/packages/driver/cypress/e2e/commands/actions/check.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/check.cy.js
@@ -98,6 +98,27 @@ describe('src/cy/commands/actions/check', () => {
       cy.get(checkbox).check()
     })
 
+    it('requeries if the DOM rerenders during actionability', () => {
+      cy.$$('[name=colors]').first().prop('disabled', true)
+
+      const listener = _.after(3, () => {
+        cy.$$('[name=colors]').first().prop('disabled', false)
+
+        const parent = cy.$$('[name=colors]').parent()
+
+        parent.replaceWith(parent[0].outerHTML)
+        cy.off('command:retry', listener)
+      })
+
+      cy.on('command:retry', listener)
+
+      cy.get('[name=colors]').check().then(($inputs) => {
+        $inputs.each((i, el) => {
+          expect($(el)).to.be.checked
+        })
+      })
+    })
+
     // readonly should only be limited to inputs, not checkboxes
     it('can check readonly checkboxes', () => {
       cy.get('#readonly-checkbox').check().then(($checkbox) => {
@@ -437,7 +458,7 @@ describe('src/cy/commands/actions/check', () => {
 
         cy.on('fail', (err) => {
           expect(checked).to.eq(1)
-          expect(err.message).to.include('`cy.check()` failed because this element')
+          expect(err.message).to.include('`cy.check()` failed because the page updated')
 
           done()
         })
@@ -1079,7 +1100,7 @@ describe('src/cy/commands/actions/check', () => {
 
         cy.on('fail', (err) => {
           expect(unchecked).to.eq(1)
-          expect(err.message).to.include('`cy.uncheck()` failed because this element')
+          expect(err.message).to.include('`cy.uncheck()` failed because the page updated')
 
           done()
         })
diff --git a/packages/driver/cypress/e2e/commands/actions/clear.cy.js b/packages/driver/cypress/e2e/commands/actions/clear.cy.js
index e751a6469a4a..09a0b6059d89 100644
--- a/packages/driver/cypress/e2e/commands/actions/clear.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/clear.cy.js
@@ -52,6 +52,26 @@ describe('src/cy/commands/actions/type - #clear', () => {
     })
   })
 
+  it('requeries if the DOM rerenders during actionability', () => {
+    const clicked = cy.stub()
+    const retried = cy.stub()
+
+    const textarea = cy.$$('#comments').val('foo bar').prop('disabled', true)
+
+    cy.on('command:retry', _.after(3, () => {
+      if (!retried.callCount) {
+        textarea.replaceWith(textarea[0].outerHTML)
+        cy.$$('#comments').prop('disabled', false).on('click', clicked)
+        retried()
+      }
+    }))
+
+    cy.get('#comments').clear().then(() => {
+      expect(clicked).to.be.calledOnce
+      expect(retried).to.be.called
+    })
+  })
+
   it('can force clear even when being covered by another element', () => {
     const $input = $('<input />')
     .attr('id', 'input-covered-in-span')
@@ -275,7 +295,7 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
       cy.on('fail', (err) => {
         expect(cleared).to.be.calledOnce
-        expect(err.message).to.include('`cy.clear()` failed because this element')
+        expect(err.message).to.include('`cy.clear()` failed because the page updated')
 
         done()
       })
diff --git a/packages/driver/cypress/e2e/commands/actions/click.cy.js b/packages/driver/cypress/e2e/commands/actions/click.cy.js
index 3fa9e8bf358f..5a63fcbdc173 100644
--- a/packages/driver/cypress/e2e/commands/actions/click.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/click.cy.js
@@ -738,6 +738,27 @@ describe('src/cy/commands/actions/click', () => {
       })
     })
 
+    it('requeries if the DOM rerenders during actionability', () => {
+      cy.$$('[name=colors]').first().prop('disabled', true)
+
+      const listener = _.after(3, () => {
+        cy.$$('[name=colors]').first().prop('disabled', false)
+
+        const parent = cy.$$('[name=colors]').parent()
+
+        parent.replaceWith(parent[0].outerHTML)
+        cy.off('command:retry', listener)
+      })
+
+      cy.on('command:retry', listener)
+
+      cy.get('[name=colors]').first().click().then(($inputs) => {
+        $inputs.each((i, el) => {
+          expect($(el)).to.be.checked
+        })
+      })
+    })
+
     it('increases the timeout delta after each click', () => {
       const count = cy.$$('#three-buttons button').length
 
@@ -813,22 +834,20 @@ describe('src/cy/commands/actions/click', () => {
     })
 
     it('places cursor at the end of [contenteditable]', () => {
-      cy.get('[contenteditable]:first')
-      .invoke('html', '<div><br></div>').click()
-      .then(expectCaret(0))
+      cy.get('[contenteditable]:first').as('edit')
+
+      cy.get('@edit').invoke('html', '<div><br></div>')
+      cy.get('@edit').click().then(expectCaret(0))
 
-      cy.get('[contenteditable]:first')
-      .invoke('html', 'foo').click()
-      .then(expectCaret(3))
+      cy.get('@edit').invoke('html', 'foo')
+      cy.get('@edit').click().then(expectCaret(3))
 
-      cy.get('[contenteditable]:first')
-      .invoke('html', '<div>foo</div>').click()
-      .then(expectCaret(3))
+      cy.get('@edit').invoke('html', '<div>foo</div>')
+      cy.get('@edit').click().then(expectCaret(3))
 
-      cy.get('[contenteditable]:first')
       // firefox headless: prevent contenteditable from disappearing (dont set to empty)
-      .invoke('html', '<br>').click()
-      .then(expectCaret(0))
+      cy.get('@edit').invoke('html', '<br>')
+      cy.get('@edit').click().then(expectCaret(0))
     })
 
     it('can click SVG elements', () => {
@@ -1595,6 +1614,16 @@ describe('src/cy/commands/actions/click', () => {
         })
       })
 
+      it('succeeds when DOM rerenders and returns new subject', () => {
+        const $btn = cy.$$('#button').prop('disabled', true)
+
+        cy.on('command:retry', _.after(3, () => {
+          $btn.replaceWith('<button id="button">New Button</button>')
+        }))
+
+        cy.get('#button').click().should('contain', 'New Button')
+      })
+
       it('waits until element stops animating', () => {
         let retries = 0
 
@@ -2120,41 +2149,21 @@ describe('src/cy/commands/actions/click', () => {
         cy.get('.badge-multi').click()
       })
 
-      it('throws when subject is not in the document', (done) => {
-        let clicked = 0
-
-        const $checkbox = cy.$$(':checkbox:first').click(() => {
-          clicked += 1
-          $checkbox.remove()
-
-          return false
-        })
-
-        cy.on('fail', (err) => {
-          expect(clicked).to.eq(1)
-          expect(err.message).to.include('`cy.click()` failed because this element is detached from the DOM')
-
-          done()
-        })
-
-        cy.get(':checkbox:first').click().click()
-      })
+      // This is an instance of an unfixable detached DOM error: .then() is a command, so it sets the subject to a
+      // *specific element*, which then gets detached.
 
+      // The error message tells the user exactly how to fix this case.
       it('throws when subject is detached during actionability', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.click()` failed because this element is detached from the DOM')
+          expect(err.message).to.include('`cy.click()` failed because the page updated while this command was executing.')
+          expect(err.message).to.include('You can typically solve this by breaking up a chain.')
 
           done()
         })
 
         cy.get('input:first')
         .then(($el) => {
-          // This represents an asynchronous re-render
-          // since we fire the 'scrolled' event during actionability
-          // if we use el.on('scroll'), headless electron is flaky
-          cy.on('scrolled', () => {
-            $el.remove()
-          })
+          cy.on('scrolled', () => $el.remove())
         })
         .click()
       })
@@ -3269,26 +3278,6 @@ describe('src/cy/commands/actions/click', () => {
         cy.dblclick()
       })
 
-      it('throws when subject is not in the document', (done) => {
-        let dblclicked = 0
-
-        const $button = cy.$$('button:first').dblclick(() => {
-          dblclicked += 1
-          $button.remove()
-
-          return false
-        })
-
-        cy.on('fail', (err) => {
-          expect(dblclicked).to.eq(1)
-          expect(err.message).to.include('`cy.dblclick()` failed because this element')
-
-          done()
-        })
-
-        cy.get('button:first').dblclick().dblclick()
-      })
-
       it('logs once when not dom subject', function (done) {
         cy.on('fail', (err) => {
           const { lastLog } = this
@@ -3708,26 +3697,6 @@ describe('src/cy/commands/actions/click', () => {
         cy.rightclick()
       })
 
-      it('throws when subject is not in the document', (done) => {
-        let rightclicked = 0
-
-        const $button = cy.$$('button:first').on('contextmenu', () => {
-          rightclicked += 1
-          $button.remove()
-
-          return false
-        })
-
-        cy.on('fail', (err) => {
-          expect(rightclicked).to.eq(1)
-          expect(err.message).to.include('`cy.rightclick()` failed because this element')
-
-          done()
-        })
-
-        cy.get('button:first').rightclick().rightclick()
-      })
-
       it('logs once when not dom subject', function (done) {
         cy.on('fail', (err) => {
           const { lastLog } = this
diff --git a/packages/driver/cypress/e2e/commands/actions/focus.cy.js b/packages/driver/cypress/e2e/commands/actions/focus.cy.js
index 1a86f1048c45..b2a48f488cbc 100644
--- a/packages/driver/cypress/e2e/commands/actions/focus.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/focus.cy.js
@@ -336,7 +336,7 @@ describe('src/cy/commands/actions/focus', () => {
 
         cy.on('fail', (err) => {
           expect(focused).to.eq(1)
-          expect(err.message).to.include('`cy.focus()` failed because this element')
+          expect(err.message).to.include('`cy.focus()` failed because the page updated')
 
           done()
         })
@@ -791,7 +791,7 @@ describe('src/cy/commands/actions/focus', () => {
 
         cy.on('fail', (err) => {
           expect(blurred).to.eq(1)
-          expect(err.message).to.include('`cy.blur()` failed because this element')
+          expect(err.message).to.include('`cy.blur()` failed because the page')
           expect(err.docsUrl).to.include('https://on.cypress.io/element-has-detached-from-dom')
 
           done()
diff --git a/packages/driver/cypress/e2e/commands/actions/scroll.cy.js b/packages/driver/cypress/e2e/commands/actions/scroll.cy.js
index 3f2b01b2db6e..dd96c4308e65 100644
--- a/packages/driver/cypress/e2e/commands/actions/scroll.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/scroll.cy.js
@@ -323,7 +323,7 @@ describe('src/cy/commands/actions/scroll', () => {
       })
 
       it('retries until element is scrollable', () => {
-        const $container = cy.$$('#nonscroll-becomes-scrollable')
+        let $container = cy.$$('#nonscroll-becomes-scrollable')
 
         expect($container.get(0).scrollTop).to.eq(0)
         expect($container.get(0).scrollLeft).to.eq(0)
@@ -331,6 +331,11 @@ describe('src/cy/commands/actions/scroll', () => {
         let retried = false
 
         cy.on('command:retry', _.after(2, () => {
+          // Replacing the element with itself to ensure that .scrollTo() is requerying the DOM
+          // as necessary
+          $container.replaceWith($container[0].outerHTML)
+          $container = cy.$$('#nonscroll-becomes-scrollable')
+
           $container.css('overflow', 'scroll')
           retried = true
         }))
@@ -450,6 +455,17 @@ describe('src/cy/commands/actions/scroll', () => {
 
           cy.get('button').scrollTo('500px')
         })
+
+        it('throws if subject disappears while waiting for scrollability', (done) => {
+          cy.on('command:retry', () => cy.$$('#nonscroll-becomes-scrollable').remove())
+
+          cy.on('fail', (err) => {
+            expect(err.message).to.include('`cy.scrollTo()` failed because the page updated')
+            done()
+          })
+
+          cy.get('#nonscroll-becomes-scrollable').scrollTo(500, 300)
+        })
       })
 
       context('argument errors', () => {
diff --git a/packages/driver/cypress/e2e/commands/actions/select.cy.js b/packages/driver/cypress/e2e/commands/actions/select.cy.js
index f0ed01b70247..e62a3ffdc871 100644
--- a/packages/driver/cypress/e2e/commands/actions/select.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/select.cy.js
@@ -214,11 +214,13 @@ describe('src/cy/commands/actions/select', () => {
       const select = cy.$$('select[name=disabled]')
 
       cy.on('command:retry', _.once(() => {
-        select.prop('disabled', false)
+        // Replace the element with a copy of itself, to ensure .select() is requerying the DOM
+        select.replaceWith(select[0].outerHTML)
+        cy.$$('select[name=disabled]').prop('disabled', false)
       }))
 
       cy.get('select[name=disabled]').select('foo')
-      .invoke('val').should('eq', 'foo')
+      cy.get('select[name=disabled]').invoke('val').should('eq', 'foo')
     })
 
     it('retries until <optgroup> is no longer disabled', () => {
@@ -376,7 +378,7 @@ describe('src/cy/commands/actions/select', () => {
 
         cy.on('fail', (err) => {
           expect(selected).to.eq(1)
-          expect(err.message).to.include('`cy.select()` failed because this element')
+          expect(err.message).to.include('`cy.select()` failed because the page updated')
 
           done()
         })
@@ -543,8 +545,7 @@ describe('src/cy/commands/actions/select', () => {
 
       it('throws when the <select> itself is disabled', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.select()` failed because this element is currently disabled:')
-          expect(err.docsUrl).to.eq('https://on.cypress.io/select')
+          expect(err.message).to.include('`cy.select()` failed because this element is `disabled`:')
 
           done()
         })
@@ -554,8 +555,7 @@ describe('src/cy/commands/actions/select', () => {
 
       it('throws when the <select> is disabled by a disabled <fieldset>', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.select()` failed because this element is currently disabled:')
-          expect(err.docsUrl).to.eq('https://on.cypress.io/select')
+          expect(err.message).to.include('`cy.select()` failed because this element is `disabled`:')
 
           done()
         })
@@ -648,7 +648,7 @@ describe('src/cy/commands/actions/select', () => {
         cy.get('#select-maps').select('de_dust2').then(function ($select) {
           const { lastLog } = this
 
-          expect(lastLog.get('$el')).to.eq($select)
+          expect(lastLog.get('$el')).to.eql($select)
         })
       })
 
diff --git a/packages/driver/cypress/e2e/commands/actions/selectFile.cy.js b/packages/driver/cypress/e2e/commands/actions/selectFile.cy.js
index e75eb986615f..aeff3963e635 100644
--- a/packages/driver/cypress/e2e/commands/actions/selectFile.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/selectFile.cy.js
@@ -336,7 +336,7 @@ describe('src/cy/commands/actions/selectFile', () => {
     })
 
     describe('errors', {
-      defaultCommandTimeout: 500,
+      defaultCommandTimeout: 100,
     }, () => {
       it('is a child command', (done) => {
         cy.on('fail', (err) => {
@@ -358,17 +358,17 @@ describe('src/cy/commands/actions/selectFile', () => {
 
       it('throws when non-input subject', function (done) {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing one. Your subject is: `<body>...</body>`')
+          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing a file input, but received the element:')
           expect(err.docsUrl).to.eq('https://on.cypress.io/selectfile')
           done()
         })
 
-        cy.get('body').selectFile({ contents: '@foo' })
+        cy.get('body').selectFile({ contents: '@foo' }, { timeout: 0 })
       })
 
       it('throws when non-file input', function (done) {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing one. Your subject is: `<input type="text" id="text-input">`')
+          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing a file input, but received the element:')
           expect(err.docsUrl).to.eq('https://on.cypress.io/selectfile')
           done()
         })
@@ -378,7 +378,7 @@ describe('src/cy/commands/actions/selectFile', () => {
 
       it('throws when label for non-file input', function (done) {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing one. Your subject is: `<label for="text-input" id="text-label">Text label</label>`')
+          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing a file input, but received the element:')
           expect(err.docsUrl).to.eq('https://on.cypress.io/selectfile')
           done()
         })
@@ -390,7 +390,7 @@ describe('src/cy/commands/actions/selectFile', () => {
         // Even though this label contains a file input, testing on real browsers confirms that clicking it
         // does *not* activate the contained input.
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing one. Your subject is: `<label for="nonexistent" id="nonexistent-label">...</label>`')
+          expect(err.message).to.include('`cy.selectFile()` can only be called on an `<input type="file">` or a `<label for="fileInput">` pointing to or containing a file input, but received the element:')
           expect(err.docsUrl).to.eq('https://on.cypress.io/selectfile')
           done()
         })
@@ -511,6 +511,32 @@ describe('src/cy/commands/actions/selectFile', () => {
       })
     })
 
+    it('retries until label is not disabled', () => {
+      cy.on('command:retry', () => {
+        // Replace the label with a copy of itself, to ensure selectFile is requerying the DOM
+        const hidden = cy.$$('#hidden-basic-label')
+
+        hidden.replaceWith(hidden[0].outerHTML)
+
+        cy.$$('#hidden-basic-label').show()
+      })
+
+      cy.get('#hidden-basic-label').selectFile({ contents: '@foo' })
+    })
+
+    it('retries until input is not disabled', () => {
+      cy.on('command:retry', () => {
+        // Replace the input with a copy of itself, to ensure selectFile is requerying the DOM
+        const disabled = cy.$$('#disabled')
+
+        disabled.replaceWith(disabled[0].outerHTML)
+
+        cy.$$('#disabled').attr('disabled', false)
+      })
+
+      cy.get('#disabled-label').selectFile({ contents: '@foo' })
+    })
+
     /*
      * The tests around actionability are somewhat limited, since the functionality is thoroughly tested in the
      * `cy.trigger()` unit tests. We include a few tests directly on `cy.selectFile()` in order to ensure we're
@@ -628,25 +654,6 @@ is being covered by another element:
         })
       })
 
-      it('waits until input stops animating', {
-        defaultCommandTimeout: 1000,
-      }, () => {
-        let retries = 0
-
-        cy.on('command:retry', (obj) => {
-          retries += 1
-        })
-
-        cy.stub(cy, 'ensureElementIsNotAnimating')
-        .throws(new Error('animating!'))
-        .onThirdCall().returns()
-
-        cy.get('#basic').selectFile({ contents: '@foo' }).then(() => {
-          expect(retries).to.eq(3)
-          expect(cy.ensureElementIsNotAnimating).to.be.calledThrice
-        })
-      })
-
       // TODO(webkit): fix+unskip for experimental webkit
       it('can specify scrollBehavior in options', { browser: '!webkit' }, () => {
         cy.get('#scroll').then((el) => {
diff --git a/packages/driver/cypress/e2e/commands/actions/submit.cy.js b/packages/driver/cypress/e2e/commands/actions/submit.cy.js
index ce3ecda8f4d8..b7752d2d4fa7 100644
--- a/packages/driver/cypress/e2e/commands/actions/submit.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/submit.cy.js
@@ -255,7 +255,7 @@ describe('src/cy/commands/actions/submit', () => {
 
         cy.on('fail', (err) => {
           expect(submitted).to.eq(1)
-          expect(err.message).to.include('`cy.submit()` failed because this element')
+          expect(err.message).to.include('`cy.submit()` failed because the page')
 
           done()
         })
diff --git a/packages/driver/cypress/e2e/commands/actions/trigger.cy.js b/packages/driver/cypress/e2e/commands/actions/trigger.cy.js
index 0e2e3c7f4b2d..90269317192f 100644
--- a/packages/driver/cypress/e2e/commands/actions/trigger.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/trigger.cy.js
@@ -149,6 +149,18 @@ describe('src/cy/commands/actions/trigger', () => {
       })
     })
 
+    it('requeries the dom while waiting for actionability', () => {
+      const $input = cy.$$('input:first').attr('disabled', true)
+
+      cy.on('command:retry', () => {
+        // Replace the input with a copy of itself, to ensure trigger is requerying the DOM
+        $input.replaceWith($input[0].outerHTML)
+        cy.$$('input:first').attr('disabled', false)
+      })
+
+      cy.get('input:first').trigger('keydown')
+    })
+
     it('can trigger events on the window', () => {
       let expected = false
 
@@ -1057,7 +1069,7 @@ describe('src/cy/commands/actions/trigger', () => {
 
         cy.on('fail', (err) => {
           expect(mouseover).to.eq(1)
-          expect(err.message).to.include('`cy.trigger()` failed because this element')
+          expect(err.message).to.include('`cy.trigger()` failed because the page')
 
           done()
         })
diff --git a/packages/driver/cypress/e2e/commands/actions/type.cy.js b/packages/driver/cypress/e2e/commands/actions/type.cy.js
index 301f660b098e..d0077401c4e0 100644
--- a/packages/driver/cypress/e2e/commands/actions/type.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/type.cy.js
@@ -264,7 +264,10 @@ describe('src/cy/commands/actions/type - #type', () => {
       const retried = cy.stub()
 
       cy.on('command:retry', _.after(3, () => {
-        $txt.show()
+        // Replace the element with a copy of itself, to ensure that .type() requeries the DOM
+        // while retrying actionability
+        $txt.replaceWith($txt[0].innerHTML)
+        cy.$$(':text:first').show()
         retried()
       }))
 
@@ -924,7 +927,8 @@ describe('src/cy/commands/actions/type - #type', () => {
     })
 
     it('inserts text after existing text input by invoking val', () => {
-      cy.get('#input-without-value').invoke('val', 'foo').type(' bar').then(($text) => {
+      cy.get('#input-without-value').invoke('val', 'foo')
+      cy.get('#input-without-value').type(' bar').then(($text) => {
         expect($text).to.have.value('foo bar')
       })
     })
@@ -1224,7 +1228,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('inserts text after existing text input by invoking val', () => {
-        cy.get('#number-without-value').invoke('val', '12').type('34').then(($text) => {
+        cy.get('#number-without-value').invoke('val', '12')
+        cy.get('#number-without-value').type('34').then(($text) => {
           expect($text).to.have.value('1234')
         })
       })
@@ -1344,7 +1349,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('inserts text after existing text input by invoking val', () => {
-        cy.get('#email-without-value').invoke('val', 'brian@foo.c').type('om').then(($text) => {
+        cy.get('#email-without-value').invoke('val', 'brian@foo.c')
+        cy.get('#email-without-value').type('om').then(($text) => {
           expect($text).to.have.value('brian@foo.com')
         })
       })
@@ -1384,7 +1390,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('inserts text after existing text input by invoking val', () => {
-        cy.get('#password-without-value').invoke('val', 'secr').type('et').then(($text) => {
+        cy.get('#password-without-value').invoke('val', 'secr')
+        cy.get('#password-without-value').type('et').then(($text) => {
           expect($text).to.have.value('secret')
         })
       })
@@ -1441,7 +1448,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('overwrites existing value input by invoking val', () => {
-        cy.get('#date-without-value').invoke('val', '2016-01-01').type('1959-09-13').then(($text) => {
+        cy.get('#date-without-value').invoke('val', '2016-01-01')
+        cy.get('#date-without-value').type('1959-09-13').then(($text) => {
           expect($text).to.have.value('1959-09-13')
         })
       })
@@ -1531,7 +1539,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('overwrites existing value input by invoking val', () => {
-        cy.get('[type="datetime-local"]').invoke('val', '2016-01-01T05:05').type('1959-09-13T10:10').should('have.value', '1959-09-13T10:10')
+        cy.get('[type="datetime-local"]').invoke('val', '2016-01-01T05:05')
+        cy.get('[type="datetime-local"]').type('1959-09-13T10:10').should('have.value', '1959-09-13T10:10')
       })
 
       it('errors when invalid datetime', (done) => {
@@ -1559,7 +1568,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('overwrites existing value input by invoking val', () => {
-        cy.get('#month-without-value').invoke('val', '2016-01').type('1959-09').then(($text) => {
+        cy.get('#month-without-value').invoke('val', '2016-01')
+        cy.get('#month-without-value').type('1959-09').then(($text) => {
           expect($text).to.have.value('1959-09')
         })
       })
@@ -1579,7 +1589,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('overwrites existing value input by invoking val', () => {
-        cy.get('#week-without-value').invoke('val', '2016-W01').type('1959-W09').then(($text) => {
+        cy.get('#week-without-value').invoke('val', '2016-W01')
+        cy.get('#week-without-value').type('1959-W09').then(($text) => {
           expect($text).to.have.value('1959-W09')
         })
       })
@@ -1599,7 +1610,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('overwrites existing value input by invoking val', () => {
-        cy.get('#time-without-value').invoke('val', '01:23:45').type('12:34:56').then(($text) => {
+        cy.get('#time-without-value').invoke('val', '01:23:45')
+        cy.get('#time-without-value').type('12:34:56').then(($text) => {
           expect($text).to.have.value('12:34:56')
         })
       })
@@ -1643,7 +1655,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       })
 
       it('inserts text after existing text', () => {
-        cy.get('#input-types [contenteditable]').invoke('text', 'foo').type(' bar').then(($text) => {
+        cy.get('#input-types [contenteditable]').invoke('text', 'foo')
+        cy.get('#input-types [contenteditable]').type(' bar').then(($text) => {
           expect($text).to.have.text('foo bar')
         })
       })
@@ -1668,9 +1681,8 @@ describe('src/cy/commands/actions/type - #type', () => {
 
         attachKeyListeners({ ce })
 
-        cy.get('#input-types [contenteditable]')
-        .invoke('text', 'foo')
-        .type('{enter}')
+        cy.get('#input-types [contenteditable]').invoke('text', 'foo')
+        cy.get('#input-types [contenteditable]').type('{enter}')
         .should(($text) => {
           expect(trimInnerText($text)).eq('foo')
         })
@@ -2488,7 +2500,8 @@ describe('src/cy/commands/actions/type - #type', () => {
 
   describe('case-insensitivity', () => {
     it('special chars are case-insensitive', () => {
-      cy.get(':text:first').invoke('val', 'bar').type('{leftarrow}{DeL}').then(($input) => {
+      cy.get(':text:first').invoke('val', 'bar')
+      cy.get(':text:first').type('{leftarrow}{DeL}').then(($input) => {
         expect($input).to.have.value('ba')
       })
     })
@@ -2787,9 +2800,8 @@ describe('src/cy/commands/actions/type - #type', () => {
       //  even if actual and expected appear the same.
       const expected = '{\n  foo:   1\n  bar:   2\n  baz:   3\n}'
 
-      cy.get('[contenteditable]:first')
-      .invoke('html', '<div><br></div>')
-      .type('{{}{enter}  foo:   1{enter}  bar:   2{enter}  baz:   3{enter}}')
+      cy.get('[contenteditable]:first').invoke('html', '<div><br></div>')
+      cy.get('[contenteditable]:first').type('{{}{enter}  foo:   1{enter}  bar:   2{enter}  baz:   3{enter}}')
       .should(($el) => {
         expectMatchInnerText($el, expected)
       })
diff --git a/packages/driver/cypress/e2e/commands/actions/type_errors.cy.js b/packages/driver/cypress/e2e/commands/actions/type_errors.cy.js
index b5c864ee7a4e..8cfcb4481ec2 100644
--- a/packages/driver/cypress/e2e/commands/actions/type_errors.cy.js
+++ b/packages/driver/cypress/e2e/commands/actions/type_errors.cy.js
@@ -40,7 +40,7 @@ describe('src/cy/commands/actions/type - #type errors', () => {
 
       cy.on('fail', (err) => {
         expect(typed).to.be.calledOnce
-        expect(err.message).to.include('`cy.type()` failed because this element')
+        expect(err.message).to.include('`cy.type()` failed because the page')
 
         done()
       })
@@ -249,6 +249,8 @@ If you want to skip parsing special character sequences and type the text exactl
     it('can type into input with invalid type attribute', () => {
       cy.get(':text:first')
       .invoke('attr', 'type', 'asdf')
+
+      cy.get(':text:first')
       .type('foobar')
       .should('have.value', 'foobar')
     })
diff --git a/packages/driver/cypress/e2e/commands/assertions.cy.js b/packages/driver/cypress/e2e/commands/assertions.cy.js
index bf0b4d00c338..537bae8966f1 100644
--- a/packages/driver/cypress/e2e/commands/assertions.cy.js
+++ b/packages/driver/cypress/e2e/commands/assertions.cy.js
@@ -628,7 +628,7 @@ describe('src/cy/commands/assertions', () => {
           done()
         })
 
-        cy.get('button:first', { timeout: 100 }).should('have.class', 'does-not-have-class')
+        cy.get('button:first', { timeout: 500 }).should('have.class', 'does-not-have-class')
       })
 
       it('has a pending state while retrying for commands with onFail', (done) => {
@@ -643,29 +643,7 @@ describe('src/cy/commands/assertions', () => {
 
         cy.on('fail', () => {})
 
-        cy.readFile('does-not-exist.json').should('exist')
-      })
-
-      it('throws when the subject isnt in the DOM', function (done) {
-        cy.$$('button:first').click(function () {
-          $(this).addClass('foo').remove()
-        })
-
-        cy.on('fail', (err) => {
-          const names = _.invokeMap(this.logs, 'get', 'name')
-
-          // the 'should' is not here because based on
-          // when we check for the element to be detached
-          // it never actually runs the assertion
-          expect(names).to.deep.eq(['get', 'click'])
-          expect(err.message).to.include('`cy.should()` failed because this element is detached')
-
-          done()
-        })
-
-        cy.get('button:first').click().should('have.class', 'foo').then(() => {
-          done('cy.should was supposed to fail')
-        })
+        cy.readFile('does-not-exist.json', { timeout: 500 }).should('exist')
       })
 
       it('throws when the subject eventually isnt in the DOM', function (done) {
@@ -682,14 +660,12 @@ describe('src/cy/commands/assertions', () => {
 
           // should is present here due to the retry
           expect(names).to.deep.eq(['get', 'click', 'assert'])
-          expect(err.message).to.include('`cy.should()` failed because this element is detached')
+          expect(err.message).to.include('`cy.should()` failed because the page updated')
 
           done()
         })
 
-        cy.get('button:first').click().should('have.class', 'foo').then(() => {
-          done('cy.should was supposed to fail')
-        })
+        cy.get('button:first').click().should('have.class', 'foo')
       })
 
       it('throws when should(\'have.length\') isnt a number', function (done) {
@@ -1496,7 +1472,7 @@ describe('src/cy/commands/assertions', () => {
 
         it('fails not.visible for detached DOM', function (done) {
           cy.on('fail', (err) => {
-            expect(err.message).include('detached')
+            expect(err.message).include('`cy.should()` failed because the page updated')
             done()
           })
 
diff --git a/packages/driver/cypress/e2e/commands/commands.cy.js b/packages/driver/cypress/e2e/commands/commands.cy.js
index b9eb9ea7c0e6..81b0940ab8c7 100644
--- a/packages/driver/cypress/e2e/commands/commands.cy.js
+++ b/packages/driver/cypress/e2e/commands/commands.cy.js
@@ -90,13 +90,13 @@ describe('src/cy/commands/commands', () => {
 
     it('throws when attempting to add an existing query', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.eq('`Cypress.Commands._addQuery()` is used to create new queries, but `get` is an existing Cypress command or query, or is reserved internally by Cypress.\n\n If you want to override an existing command or query, use `Cypress.Commands.overrideQuery()` instead.')
+        expect(err.message).to.eq('`Cypress.Commands.addQuery()` is used to create new queries, but `get` is an existing Cypress command or query, or is reserved internally by Cypress.\n\n If you want to override an existing command or query, use `Cypress.Commands.overrideQuery()` instead.')
         expect(err.docsUrl).to.eq('https://on.cypress.io/custom-commands')
 
         done()
       })
 
-      Cypress.Commands._addQuery('get', () => {
+      Cypress.Commands.addQuery('get', () => {
         cy
         .get('[contenteditable]')
         .first()
@@ -138,13 +138,13 @@ describe('src/cy/commands/commands', () => {
 
     it('throws when attempting to add a query with the same name as an internal function', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.eq('`Cypress.Commands._addQuery()` cannot create a new query named `addCommand` because that name is reserved internally by Cypress.')
+        expect(err.message).to.eq('`Cypress.Commands.addQuery()` cannot create a new query named `addCommand` because that name is reserved internally by Cypress.')
         expect(err.docsUrl).to.eq('https://on.cypress.io/custom-commands')
 
         done()
       })
 
-      Cypress.Commands._addQuery('addCommand', () => {
+      Cypress.Commands.addQuery('addCommand', () => {
         cy
         .get('[contenteditable]')
         .first()
diff --git a/packages/driver/cypress/e2e/commands/connectors.cy.js b/packages/driver/cypress/e2e/commands/connectors.cy.js
index f0a91c71aff3..924068aefb59 100644
--- a/packages/driver/cypress/e2e/commands/connectors.cy.js
+++ b/packages/driver/cypress/e2e/commands/connectors.cy.js
@@ -310,7 +310,7 @@ describe('src/cy/commands/connectors', () => {
             return $div
           })
           .then(function () {
-            expect(cy.currentSubject()).not.to.be.instanceof(this.remoteWindow.$)
+            expect(cy.subject()).not.to.be.instanceof(this.remoteWindow.$)
           })
         })
       })
diff --git a/packages/driver/cypress/e2e/commands/querying/focused.cy.js b/packages/driver/cypress/e2e/commands/querying/focused.cy.js
index 1619091130c7..9ade66e6e1c4 100644
--- a/packages/driver/cypress/e2e/commands/querying/focused.cy.js
+++ b/packages/driver/cypress/e2e/commands/querying/focused.cy.js
@@ -123,7 +123,7 @@ describe('src/cy/commands/querying', () => {
         cy.get('input:first').focused().then(function ($input) {
           const { lastLog } = this
 
-          expect(lastLog.get('$el')).to.eq($input)
+          expect(lastLog.get('$el')).to.eql($input)
         })
       })
 
diff --git a/packages/driver/cypress/e2e/commands/querying/querying.cy.js b/packages/driver/cypress/e2e/commands/querying/querying.cy.js
index 69bbe497b10f..76880c27456d 100644
--- a/packages/driver/cypress/e2e/commands/querying/querying.cy.js
+++ b/packages/driver/cypress/e2e/commands/querying/querying.cy.js
@@ -419,10 +419,10 @@ describe('src/cy/commands/querying', () => {
             referencesAlias: undefined,
           }
 
-          expect(this.lastLog.get('$el')).to.eq($body)
+          expect(this.lastLog.get('$el')).to.eql($body)
 
           _.each(obj, (value, key) => {
-            expect(this.lastLog.get(key)).deep.eq(value, `expected key: ${key} to eq value: ${value}`)
+            expect(this.lastLog.get(key)).to.eq(value, `expected key: ${key} to eq value: ${value}`)
           })
         })
       })
diff --git a/packages/driver/cypress/e2e/cypress/cy.cy.js b/packages/driver/cypress/e2e/cypress/cy.cy.js
index 5da36ca6fe40..fd7f5291d006 100644
--- a/packages/driver/cypress/e2e/cypress/cy.cy.js
+++ b/packages/driver/cypress/e2e/cypress/cy.cy.js
@@ -142,7 +142,7 @@ describe('driver/src/cypress/cy', () => {
 
       cy.wrap(subject).then(() => {
         expect(cy.state('subject')).to.equal(subject)
-        expect(Cypress.utils.warning).to.be.calledWith('`cy.state(\'subject\')` has been deprecated and will be removed in a future release. Consider migrating to `cy.currentSubject()` instead.')
+        expect(Cypress.utils.warning).to.be.calledWith('`cy.state(\'subject\')` has been deprecated and will be removed in a future release. Consider migrating to `cy.subject()` instead.')
       })
     })
   })
@@ -300,23 +300,6 @@ describe('driver/src/cypress/cy', () => {
         cy.c('bar')
       })
 
-      it('fails when previous subject becomes detached', (done) => {
-        cy.$$('#button').click(function () {
-          return $(this).remove()
-        })
-
-        cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.parent()` failed because this element is detached from the DOM.')
-          expect(err.message).to.include('<button id="button">button</button>')
-          expect(err.message).to.include('> `cy.click()`')
-          expect(err.docsUrl).to.eq('https://on.cypress.io/element-has-detached-from-dom')
-
-          done()
-        })
-
-        cy.get('#button').click().parent({ timeout: 50 })
-      })
-
       it('fails when previous subject isnt window', (done) => {
         cy.on('fail', (err) => {
           expect(err.message).to.include('`cy.winOnly()` failed because it requires the subject be a global `window` object.')
@@ -498,32 +481,32 @@ describe('driver/src/cypress/cy', () => {
   }, () => {
     it('throws when queries return a promise', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.include('`cy.aQuery()` failed because you returned a promise from a query.\n\nQueries must be synchronous functions that return a function. You cannot invoke commands or return promises inside of them.')
+        expect(err.message).to.include('`cy.promiseQuery()` failed because you returned a promise from a query.\n\nQueries must be synchronous functions that return a function. You cannot invoke commands or return promises inside of them.')
         done()
       })
 
-      Cypress.Commands._overwriteQuery('aQuery', () => Promise.resolve())
-      cy.aQuery()
+      Cypress.Commands.addQuery('promiseQuery', () => Promise.resolve())
+      cy.promiseQuery()
     })
 
     it('throws when a query returns a non-function value', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.include('`cy.aQuery()` failed because you returned a value other than a function from a query.\n\nQueries must be synchronous functions that return a function.\n\nThe returned value was:\n\n  > `1`')
+        expect(err.message).to.include('`cy.badReturnQuery()` failed because you returned a value other than a function from a query.\n\nQueries must be synchronous functions that return a function.\n\nThe returned value was:\n\n  > `1`')
         done()
       })
 
-      Cypress.Commands._overwriteQuery('aQuery', () => 1)
-      cy.aQuery()
+      Cypress.Commands.addQuery('badReturnQuery', () => 1)
+      cy.badReturnQuery()
     })
 
     it('throws when a command is invoked inside a query', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.include('`cy.aQuery()` failed because you invoked a command inside a query.\n\nQueries must be synchronous functions that return a function. You cannot invoke commands or return promises inside of them.\n\nThe command invoked was:\n\n  > `cy.visit()`')
+        expect(err.message).to.include('`cy.commandQuery()` failed because you invoked a command inside a query.\n\nQueries must be synchronous functions that return a function. You cannot invoke commands or return promises inside of them.\n\nThe command invoked was:\n\n  > `cy.visit()`')
         done()
       })
 
-      Cypress.Commands._overwriteQuery('aQuery', () => cy.visit('/'))
-      cy.aQuery()
+      Cypress.Commands.addQuery('commandQuery', () => cy.visit('/'))
+      cy.commandQuery()
     })
 
     it('custom commands that return query chainers retry', () => {
@@ -538,21 +521,36 @@ describe('driver/src/cypress/cy', () => {
 
       cy.on('log:added', (attrs, log) => logs.push(log))
 
-      Cypress.Commands._overwriteQuery('aQuery', () => {
+      Cypress.Commands.addQuery('getButtonQuery', () => {
         cy.now('get', 'body')
 
         return cy.now('get', 'button')
       })
 
-      Cypress.Commands._overwriteQuery('bQuery', () => cy.now('aQuery'))
+      Cypress.Commands.addQuery('queryQuery', () => cy.now('getButtonQuery'))
 
-      cy.aQuery().should('have.length', 24)
+      cy.queryQuery().should('have.length', 24)
       cy.then(() => {
-        // Length of 3: bQuery.body (from get), bQuery.button (from get), should.have.length.23
+        // Length of 3: getButtonQuery.body (from get), getButtonQuery.button (from get), `should.have.length.24`
         expect(logs.length).to.eq(3)
       })
     })
 
+    it('closes each log as the query completes', (done) => {
+      let getLog
+
+      cy.on('log:added', (attrs, log) => {
+        if (attrs.name === 'get') {
+          getLog = log
+        } else if (attrs.name === 'find') {
+          expect(getLog.get('state')).to.eq('passed')
+          done()
+        }
+      })
+
+      cy.get('body').find('#wrapper')
+    })
+
     it('ends all messages when query chain fails', (done) => {
       const logs = []
 
diff --git a/packages/driver/cypress/support/utils.ts b/packages/driver/cypress/support/utils.ts
index d18e1fd737e1..13050d662e86 100644
--- a/packages/driver/cypress/support/utils.ts
+++ b/packages/driver/cypress/support/utils.ts
@@ -172,7 +172,7 @@ export const makeRequestForCookieBehaviorTests = (
   })
 }
 
-Cypress.Commands.add('getAll', getAllFn)
+Cypress.Commands.addQuery('getAll', getAllFn)
 
 Cypress.Commands.add('shouldWithTimeout', shouldWithTimeout)
 
diff --git a/packages/driver/src/cross-origin/origin_fn.ts b/packages/driver/src/cross-origin/origin_fn.ts
index 0ffb4e18c133..8893d9325540 100644
--- a/packages/driver/src/cross-origin/origin_fn.ts
+++ b/packages/driver/src/cross-origin/origin_fn.ts
@@ -118,7 +118,7 @@ export const handleOriginFn = (Cypress: Cypress.Cypress, cy: $Cy) => {
       queueFinished = true
       setRunnableStateToPassed()
       Cypress.specBridgeCommunicator.toPrimary('queue:finished', {
-        subject: cy.currentSubject(),
+        subject: cy.subject(),
       }, {
         syncGlobals: true,
       })
diff --git a/packages/driver/src/cy/actionability.ts b/packages/driver/src/cy/actionability.ts
index e59c22f33ea8..7809af9f616e 100644
--- a/packages/driver/src/cy/actionability.ts
+++ b/packages/driver/src/cy/actionability.ts
@@ -291,8 +291,9 @@ const ensureNotAnimating = function (cy, $el, coordsHistory, animationDistanceTh
 }
 
 interface VerifyCallbacks {
-  onReady?: ($el: any, coords: ElementPositioning) => any
+  onReady?: (finalEl: any, coords: ElementPositioning, $el: any) => any
   onScroll?: ($el: any, type: 'element' | 'window' | 'container') => any
+  subjectFn?: () => any
 }
 
 const verify = function (cy, $el, config, options, callbacks: VerifyCallbacks) {
@@ -366,6 +367,7 @@ const verify = function (cy, $el, config, options, callbacks: VerifyCallbacks) {
 
       if (force !== true) {
         // ensure it's attached
+        cy.ensureElement($el, null, _log)
         cy.ensureAttached($el, null, _log)
 
         // ensure its 'receivable'
@@ -444,7 +446,7 @@ const verify = function (cy, $el, config, options, callbacks: VerifyCallbacks) {
         finalEl = $elAtCoords != null ? $elAtCoords : $el
       }
 
-      return onReady(finalEl, finalCoords)
+      return onReady(finalEl, finalCoords, $el)
     }
 
     // we cannot enforce async promises here because if our
@@ -453,6 +455,19 @@ const verify = function (cy, $el, config, options, callbacks: VerifyCallbacks) {
     // the checks and firing the event!
     const retryActionability = () => {
       try {
+        if (callbacks.subjectFn) {
+          $el = callbacks.subjectFn()
+
+          if ($el.length === 0 || $dom.isDetached($el)) {
+            const current = cy.state('current')
+            const subjectChain = cy.subjectChain(current.get('chainerId'))
+
+            $errUtils.throwErrByPath('subject.detached_during_actionability', {
+              args: { name: current.get('name'), subjectChain },
+            })
+          }
+        }
+
         return runAllChecks()
       } catch (err) {
         options.error = err
diff --git a/packages/driver/src/cy/commands/actions/check.ts b/packages/driver/src/cy/commands/actions/check.ts
index d882ed080851..11a7fff8daef 100644
--- a/packages/driver/src/cy/commands/actions/check.ts
+++ b/packages/driver/src/cy/commands/actions/check.ts
@@ -52,9 +52,11 @@ const checkOrUncheck = (Cypress, cy, type, subject, values: any[] = [], userOpti
     return (values.length === 0) || values.includes(value)
   }
 
+  const subjectChain = cy.subjectChain()
+
   // blow up if any member of the subject
   // isnt a checkbox or radio
-  const checkOrUncheckEl = (el) => {
+  const checkOrUncheckEl = (el, index) => {
     const $el = $dom.wrap(el)
     const node = $dom.stringify($el)
 
@@ -68,10 +70,8 @@ const checkOrUncheck = (Cypress, cy, type, subject, values: any[] = [], userOpti
       })
     }
 
-    const isElActionable = elHasMatchingValue($el)
-
-    if (isElActionable) {
-      matchingElements.push(el)
+    if (!elHasMatchingValue($el)) {
+      return
     }
 
     const consoleProps: Record<string, any> = {
@@ -79,7 +79,7 @@ const checkOrUncheck = (Cypress, cy, type, subject, values: any[] = [], userOpti
       'Elements': $el.length,
     }
 
-    if (options.log && isElActionable) {
+    if (options.log) {
       // figure out the userOptions which actually change the behavior of clicks
       const deltaOptions = $utils.filterOutOptions(options)
 
@@ -103,56 +103,57 @@ const checkOrUncheck = (Cypress, cy, type, subject, values: any[] = [], userOpti
           args: { node, cmd: type },
         })
       }
+    }
+
+    // if the checkbox was already checked
+    // then notify the user of this note
+    // and bail
+    if (isNoop($el)) {
+      if (!options.force) {
+        // still ensure visibility even if the command is noop
+        cy.ensureVisibility($el, options._log)
+      }
+
+      // if the checkbox is in an indeterminate state, checking or unchecking should set the
+      // prop to false to move it into a "determinate" state
+      // https://github.com/cypress-io/cypress/issues/19098
+      if ($el.prop('indeterminate')) {
+        $el.prop('indeterminate', false)
+      }
+
+      if (options._log) {
+        const inputType = $el.is(':radio') ? 'radio' : 'checkbox'
 
-      // if the checkbox was already checked
-      // then notify the user of this note
-      // and bail
-      if (isNoop($el)) {
-        if (!options.force) {
-          // still ensure visibility even if the command is noop
-          cy.ensureVisibility($el, options._log)
-        }
-
-        // if the checkbox is in an indeterminate state, checking or unchecking should set the
-        // prop to false to move it into a "determinate" state
-        // https://github.com/cypress-io/cypress/issues/19098
-        if ($el.prop('indeterminate')) {
-          $el.prop('indeterminate', false)
-        }
-
-        if (options._log) {
-          const inputType = $el.is(':radio') ? 'radio' : 'checkbox'
-
-          consoleProps.Note = `This ${inputType} was already ${type}ed. No operation took place.`
-          options._log.snapshot().end()
-        }
-
-        return null
+        consoleProps.Note = `This ${inputType} was already ${type}ed. No operation took place.`
+        options._log.snapshot().end()
       }
+
+      matchingElements.push($el[0])
+
+      return null
     }
 
     // if we didnt pass in any values or our
     // el's value is in the array then check it
-    if (isElActionable) {
-      return cy.now('click', $el, {
-        $el,
-        log: false,
-        verify: false,
-        _log: options._log,
-        force: options.force,
-        timeout: options.timeout,
-        interval: options.interval,
-        waitForAnimations: options.waitForAnimations,
-        animationDistanceThreshold: options.animationDistanceThreshold,
-        scrollBehavior: options.scrollBehavior,
-      }).then(() => {
-        if (options._log) {
-          options._log.snapshot().end()
-        }
-
-        return null
-      })
-    }
+    return cy.now('click', $el, {
+      $el,
+      subjectFn: () => cy.getSubjectFromChain(subjectChain).eq(index),
+      log: false,
+      verify: false,
+      _log: options._log,
+      force: options.force,
+      timeout: options.timeout,
+      interval: options.interval,
+      waitForAnimations: options.waitForAnimations,
+      animationDistanceThreshold: options.animationDistanceThreshold,
+      scrollBehavior: options.scrollBehavior,
+    }).then(($el) => {
+      if (options._log) {
+        options._log.snapshot().end()
+      }
+
+      matchingElements.push($el[0])
+    })
   }
 
   // return our original subject when our promise resolves
@@ -162,7 +163,7 @@ const checkOrUncheck = (Cypress, cy, type, subject, values: any[] = [], userOpti
   .then(() => {
     // filter down our $el to the
     // matching elements
-    options.$el = options.$el.filter(matchingElements)
+    options.$el = cy.$$(matchingElements)
 
     const verifyAssertions = () => {
       return cy.verifyUpcomingAssertions(options.$el, options, {
diff --git a/packages/driver/src/cy/commands/actions/click.ts b/packages/driver/src/cy/commands/actions/click.ts
index a14d43773ed9..40377fe76fff 100644
--- a/packages/driver/src/cy/commands/actions/click.ts
+++ b/packages/driver/src/cy/commands/actions/click.ts
@@ -39,6 +39,7 @@ const formatMouseEvents = (events) => {
 // TODO: remove any, Function, Record
 type MouseActionOptions = {
   subject: any
+  subjectFn?: () => any
   positionOrX: string | number
   y: number
   userOptions: Record<string, any>
@@ -105,7 +106,10 @@ export default (Commands, Cypress, cy: $Cy, state, config) => {
       }
     }
 
-    const perform = (el) => {
+    const subjectChain = cy.subjectChain()
+    const clickedElements: any[] = []
+
+    const perform = (el, index) => {
       let deltaOptions
       const $el = $dom.wrap(el)
 
@@ -150,7 +154,7 @@ export default (Commands, Cypress, cy: $Cy, state, config) => {
             'Options': deltaOptions,
           })
 
-          if (options.$el.get(0) !== elClicked) {
+          if (options.$el.get(index) !== elClicked) {
             // only do this if $elToClick isnt $el
             consoleObj['Actual Element Clicked'] = $dom.getElements($(elClicked))
           }
@@ -194,17 +198,21 @@ export default (Commands, Cypress, cy: $Cy, state, config) => {
       // once we establish the coordinates and the element
       // passes all of the internal checks
       return $actionability.verify(cy, $el, config, individualOptions, {
+        subjectFn: options.subjectFn || (() => cy.getSubjectFromChain(subjectChain).eq(index)),
+
         onScroll ($el, type) {
           return Cypress.action('cy:scrolled', $el, type)
         },
 
-        onReady ($elToClick, coords) {
+        onReady ($elToClick, coords, $el) {
           const { fromElViewport, fromElWindow, fromAutWindow } = coords
 
           const forceEl = options.force && $elToClick.get(0)
 
           const moveEvents = mouse.move(fromElViewport, forceEl)
 
+          clickedElements.push($el[0])
+
           flagModifiers(true)
 
           const onReadyProps = onReady(fromElViewport, forceEl)
@@ -236,6 +244,8 @@ export default (Commands, Cypress, cy: $Cy, state, config) => {
     return Promise
     .each(options.$el.toArray(), perform)
     .then(() => {
+      options.$el = cy.$$(clickedElements)
+
       if (options.verify === false) {
         return options.$el
       }
diff --git a/packages/driver/src/cy/commands/actions/scroll.ts b/packages/driver/src/cy/commands/actions/scroll.ts
index f918f0f459a4..c8d88ae9f4a6 100644
--- a/packages/driver/src/cy/commands/actions/scroll.ts
+++ b/packages/driver/src/cy/commands/actions/scroll.ts
@@ -248,31 +248,10 @@ export default (Commands, Cypress, cy, state) => {
         x = 0
       }
 
-      let $container
       let isWin
 
-      // if our subject is window let it fall through
-      if (subject && !$dom.isWindow(subject)) {
-        // if they passed something here, its a DOM element
-        $container = subject
-      } else {
-        isWin = true
-        // if we don't have a subject, then we are a parent command
-        // assume they want to scroll the entire window.
-        $container = state('window')
-
-        // jQuery scrollTo looks for the prop contentWindow
-        // otherwise it'll use the wrong window to scroll :(
-        $container.contentWindow = $container
-      }
-
-      // throw if we're trying to scroll multiple containers
-      if (!isWin && $container.length > 1) {
-        $errUtils.throwErrByPath('scrollTo.multiple_containers', { args: { num: $container.length } })
-      }
-
       const options: InternalScrollToOptions = _.defaults({}, userOptions, {
-        $el: $container,
+        $el: subject,
         log: true,
         duration: 0,
         easing: 'swing',
@@ -345,23 +324,53 @@ export default (Commands, Cypress, cy, state) => {
           },
         }
 
-        if (!isWin) {
-          log.$el = options.$el
-        }
-
         options._log = Cypress.log(log)
       }
 
-      const ensureScrollability = () => {
-        // Some elements are not scrollable, user may opt out of error checking
-        // https://github.com/cypress-io/cypress/issues/1924
-        if (!options.ensureScrollable) {
-          return
-        }
+      const subjectChain = cy.subjectChain()
 
+      const ensureScrollability = () => {
         try {
-          // make sure our container can even be scrolled
-          return cy.ensureScrollability($container, 'scrollTo')
+          subject = cy.getSubjectFromChain(subjectChain)
+
+          if (!subject || $dom.isWindow(subject)) {
+            isWin = true
+            // if we don't have a subject, then we are a parent command
+            // assume they want to scroll the entire window.
+            options.$el = state('window')
+
+            // jQuery scrollTo looks for the prop contentWindow
+            // otherwise it'll use the wrong window to scroll :(
+            options.$el.contentWindow = options.$el
+          } else {
+            // if they passed something here, its a DOM element
+            options.$el = subject
+
+            // scrollTo does not use the normal $actionability check, because that check contains, itself, scrolling
+            // logic. But we still want to throw the same error if our subject disappears while retrying.
+            if (options.$el.length === 0 || $dom.isDetached(options.$el)) {
+              const current = cy.state('current')
+
+              $errUtils.throwErrByPath('subject.detached_during_actionability', {
+                args: { name: current.get('name'), subjectChain },
+              })
+            }
+
+            cy.ensureElement(options.$el, 'scrollTo')
+          }
+
+          // throw if we're trying to scroll multiple containers
+          if (!isWin && options.$el.length > 1) {
+            $errUtils.throwErrByPath('scrollTo.multiple_containers', { args: { num: options.$el.length } })
+          }
+
+          options._log?.set('$el', options.$el)
+
+          // Some elements are not scrollable, user may opt out of error checking
+          // https://github.com/cypress-io/cypress/issues/1924
+          if (options.ensureScrollable) {
+            cy.ensureScrollability(options.$el, 'scrollTo')
+          }
         } catch (err) {
           options.error = err
 
diff --git a/packages/driver/src/cy/commands/actions/select.ts b/packages/driver/src/cy/commands/actions/select.ts
index e21e2e31d806..d8ce14b515e9 100644
--- a/packages/driver/src/cy/commands/actions/select.ts
+++ b/packages/driver/src/cy/commands/actions/select.ts
@@ -47,8 +47,8 @@ export default (Commands, Cypress, cy) => {
         const deltaOptions = $utils.filterOutOptions(options)
 
         options._log = Cypress.log({
-          message: deltaOptions,
           $el: options.$el,
+          message: deltaOptions,
           timeout: options.timeout,
           consoleProps () {
             // merge into consoleProps without mutating it
@@ -104,13 +104,16 @@ export default (Commands, Cypress, cy) => {
         $errUtils.throwErrByPath('select.invalid_multiple')
       }
 
+      const subjectChain = cy.subjectChain()
+
       const getOptions = () => {
+        options.$el = cy.getSubjectFromChain(subjectChain)
         let notAllUniqueValues
 
         // throw if <select> is disabled
-        if (!options.force && options.$el.prop('disabled')) {
-          node = $dom.stringify(options.$el)
-          $errUtils.throwErrByPath('select.disabled', { args: { node } })
+        if (!options.force) {
+          cy.ensureElement(options.$el, 'select', options._log)
+          cy.ensureNotDisabled(options.$el, options._log)
         }
 
         const values: string[] = []
@@ -235,12 +238,12 @@ export default (Commands, Cypress, cy) => {
           const activeElement = $elements.getActiveElByDocument(options.$el)
 
           if (!options.force && activeElement === null) {
-            const node = $dom.stringify(options.$el)
-            const onFail = options._log
-
-            $errUtils.throwErrByPath('select.disabled', {
-              onFail,
-              args: { node },
+            $errUtils.throwErrByPath('dom.disabled', {
+              onFail: options._log,
+              args: {
+                cmd: 'select',
+                node: $dom.stringify(options.$el),
+              },
             })
           }
 
diff --git a/packages/driver/src/cy/commands/actions/selectFile.ts b/packages/driver/src/cy/commands/actions/selectFile.ts
index 89b89354c1ff..5e7d9e1174d3 100644
--- a/packages/driver/src/cy/commands/actions/selectFile.ts
+++ b/packages/driver/src/cy/commands/actions/selectFile.ts
@@ -79,6 +79,7 @@ const createDataTransfer = (files: Cypress.FileReferenceObject[], eventTarget: J
 interface InternalSelectFileOptions extends Cypress.SelectFileOptions {
   _log: any
   $el: JQuery
+  eventTarget: JQuery
 }
 
 const ACTIONS = {
@@ -228,6 +229,7 @@ export default (Commands, Cypress, cy, state, config) => {
         action: 'select',
         log: true,
         $el: subject,
+        eventTarget: subject,
       })
 
       if (options.log) {
@@ -259,37 +261,48 @@ export default (Commands, Cypress, cy, state, config) => {
         })
       }
 
-      let eventTarget = subject
+      const getEventTargetFromSubject = (subject) => {
+        let eventTarget = subject
 
-      // drag-drop always targets the subject directly, but select
-      // may switch <label> -> <input> element
-      if (options.action === 'select') {
-        if (eventTarget.is('label')) {
-          eventTarget = $dom.getInputFromLabel(eventTarget)
-        }
+        if (options.action === 'select') {
+          if (eventTarget.is('label')) {
+            eventTarget = $dom.getInputFromLabel(eventTarget)
+          }
 
-        if (eventTarget.length < 1 || !$dom.isInputType(eventTarget, 'file')) {
-          const node = $dom.stringify(options.$el)
+          if (eventTarget.length < 1 || !$dom.isInputType(eventTarget, 'file')) {
+            const node = $dom.stringify(options.$el)
 
-          $errUtils.throwErrByPath('selectFile.not_file_input', {
-            onFail: options._log,
-            args: { node },
-          })
+            $errUtils.throwErrByPath('selectFile.not_file_input', {
+              onFail: options._log,
+              args: { node },
+            })
+          }
         }
-      }
 
-      if (!options.force) {
-        cy.ensureNotDisabled(eventTarget, options._log)
+        if (!options.force) {
+          cy.ensureNotDisabled(eventTarget, options._log)
+        }
+
+        return eventTarget
       }
 
       // Make sure files is an array even if the user only passed in one
       const filesArray = await Promise.all(([] as Cypress.FileReference[]).concat(files).map(parseFile(options)))
 
+      const subjectChain = cy.subjectChain()
+
       // We verify actionability on the subject, rather than the eventTarget,
       // in order to allow for a hidden <input> with a visible <label>
       // Similarly, this is why we implement something similar, but not identical to,
       // cy.trigger() to dispatch our events.
       await $actionability.verify(cy, subject, config, options, {
+        subjectFn () {
+          subject = cy.getSubjectFromChain(subjectChain)
+          options.eventTarget = getEventTargetFromSubject(subject)
+
+          return subject
+        },
+
         onScroll ($el, type) {
           Cypress.action('cy:scrolled', $el, type)
         },
@@ -306,9 +319,9 @@ export default (Commands, Cypress, cy, state, config) => {
             })
           }
 
-          const dataTransfer = createDataTransfer(filesArray, eventTarget)
+          const dataTransfer = createDataTransfer(filesArray, options.eventTarget as JQuery<HTMLElement>)
 
-          ACTIONS[options.action as string](eventTarget.get(0), dataTransfer, coords, state)
+          ACTIONS[options.action as string](options.eventTarget?.get(0), dataTransfer, coords, state)
 
           return $elToClick
         },
diff --git a/packages/driver/src/cy/commands/actions/trigger.ts b/packages/driver/src/cy/commands/actions/trigger.ts
index 1241cb4e64be..6b0784a3cd6d 100644
--- a/packages/driver/src/cy/commands/actions/trigger.ts
+++ b/packages/driver/src/cy/commands/actions/trigger.ts
@@ -117,12 +117,16 @@ export default (Commands, Cypress, cy, state, config) => {
         subject = options.$el.first()
       }
 
+      const subjectChain = cy.subjectChain()
+
       const trigger = () => {
         if (dispatchEarly) {
           return dispatch(subject, state('window'), eventName, eventOptions)
         }
 
         return $actionability.verify(cy, subject, config, options, {
+          subjectFn: () => cy.getSubjectFromChain(subjectChain),
+
           onScroll ($el, type) {
             Cypress.action('cy:scrolled', $el, type)
           },
diff --git a/packages/driver/src/cy/commands/actions/type.ts b/packages/driver/src/cy/commands/actions/type.ts
index e42400c62eb4..5d1f8cf3e872 100644
--- a/packages/driver/src/cy/commands/actions/type.ts
+++ b/packages/driver/src/cy/commands/actions/type.ts
@@ -476,6 +476,8 @@ export default function (Commands, Cypress, cy, state, config) {
       })
     }
 
+    const subjectChain = cy.subjectChain()
+
     const handleFocused = function () {
       // if it's the body, don't need to worry about focus
       // (unless it can be modified i.e we're in designMode or contenteditable)
@@ -509,6 +511,8 @@ export default function (Commands, Cypress, cy, state, config) {
       }
 
       return $actionability.verify(cy, options.$el, config, options, {
+        subjectFn: () => cy.getSubjectFromChain(subjectChain),
+
         onScroll ($el, type) {
           return Cypress.action('cy:scrolled', $el, type)
         },
diff --git a/packages/driver/src/cy/commands/aliasing.ts b/packages/driver/src/cy/commands/aliasing.ts
index 5cc8fc86bdaa..f343ee9ac3de 100644
--- a/packages/driver/src/cy/commands/aliasing.ts
+++ b/packages/driver/src/cy/commands/aliasing.ts
@@ -2,7 +2,7 @@ import _ from 'lodash'
 import $dom from '../../dom'
 
 export default function (Commands, Cypress, cy) {
-  Commands._addQuery('as', function asFn (alias) {
+  Commands.addQuery('as', function asFn (alias) {
     cy.ensureChildCommand(this, [alias])
     cy.validateAlias(alias)
 
@@ -12,8 +12,7 @@ export default function (Commands, Cypress, cy) {
 
     // Shallow clone of the existing subject chain, so that future commands running on the same chainer
     // don't apply here as well.
-    const chainerId = cy.state('chainerId')
-    const subjectChain = [...cy.state('subjects')[chainerId]]
+    const subjectChain = [...cy.subjectChain()]
 
     const fileName = prevCommand.get('fileName')
 
@@ -36,7 +35,7 @@ export default function (Commands, Cypress, cy) {
       const log: any = _.last(cy.queue.logs({
         instrument: 'command',
         event: false,
-        chainerId,
+        chainerId: this.get('chainerId'),
       }))
 
       const alreadyAliasedLog = _.map(prevCommand.get('logs'), 'attributes.alias').find((a) => a === alias)
diff --git a/packages/driver/src/cy/commands/asserting.ts b/packages/driver/src/cy/commands/asserting.ts
index cdb37022ec31..271fb50e67c7 100644
--- a/packages/driver/src/cy/commands/asserting.ts
+++ b/packages/driver/src/cy/commands/asserting.ts
@@ -125,9 +125,9 @@ export default function (Commands, Cypress, cy, state) {
 
       try {
         if (value === lastChainer && !isCheckingExistence) {
-        // https://github.com/cypress-io/cypress/issues/16006
-        // Referring some commands like 'visible'  triggers assert function in chai_jquery.js
-        // It creates duplicated messages and confuses users.
+          // https://github.com/cypress-io/cypress/issues/16006
+          // Referring some commands like 'visible'  triggers assert function in chai_jquery.js
+          // It creates duplicated messages and confuses users.
           const cmd = memo[value]
 
           if (_.isFunction(cmd)) {
diff --git a/packages/driver/src/cy/commands/connectors.ts b/packages/driver/src/cy/commands/connectors.ts
index bc9c43305a5d..86b508f36e56 100644
--- a/packages/driver/src/cy/commands/connectors.ts
+++ b/packages/driver/src/cy/commands/connectors.ts
@@ -143,7 +143,7 @@ export default function (Commands, Cypress, cy, state) {
   // to allow the falsy value 0 to be used
   const isPath = (str) => (!!str || str === 0)
 
-  Commands._addQuery('its', function its (path, options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}, ...args) {
+  Commands.addQuery('its', function its (path, options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}, ...args) {
     // If we're being used in .invoke(), we us it. For any other current command (.its itself or a custom command),
     // we fall back to the .its() error messages.
     const cmd = this.get('name') === 'invoke' ? 'invoke' : 'its'
@@ -189,7 +189,7 @@ export default function (Commands, Cypress, cy, state) {
 
       const value = _.get(subject, path)
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         $el: $dom.isElement(subject) ? subject : null,
         consoleProps () {
           const obj = {
@@ -214,7 +214,7 @@ export default function (Commands, Cypress, cy, state) {
     }
   })
 
-  Commands._addQuery('invoke', function invoke (optionsOrPath, argOrOptions, ...args) {
+  Commands.addQuery('invoke', function invoke (optionsOrPath, argOrOptions, ...args) {
     let options
     let path
 
@@ -276,7 +276,7 @@ export default function (Commands, Cypress, cy, state) {
 
       let value = parent[last](...args)
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         $el: $dom.isElement(subject) ? subject : null,
         consoleProps: () => {
           return {
diff --git a/packages/driver/src/cy/commands/debugging.ts b/packages/driver/src/cy/commands/debugging.ts
index 031a29f1eadc..6220d7b25036 100644
--- a/packages/driver/src/cy/commands/debugging.ts
+++ b/packages/driver/src/cy/commands/debugging.ts
@@ -42,7 +42,7 @@ export default (Commands, Cypress, cy, state, config) => {
 
   // pause should indefinitely pause until the user
   // presses a key or clicks in the UI to continue
-  Commands._addQuery('pause', function pause (options: Partial<Cypress.Loggable> = {}) {
+  Commands.addQuery('pause', function pause (options: Partial<Cypress.Loggable> = {}) {
     if (!config('isInteractive') && (!config('browser').isHeaded || config('exit'))) {
       return _.identity
     }
@@ -101,7 +101,7 @@ export default (Commands, Cypress, cy, state, config) => {
     }
   })
 
-  Commands._addQuery('debug', function debug (options: Partial<Cypress.Loggable> = {}) {
+  Commands.addQuery('debug', function debug (options: Partial<Cypress.Loggable> = {}) {
     options.log !== false && Cypress.log({
       snapshot: true,
       end: true,
diff --git a/packages/driver/src/cy/commands/location.ts b/packages/driver/src/cy/commands/location.ts
index f9a24381f6bc..1d0057edaa28 100644
--- a/packages/driver/src/cy/commands/location.ts
+++ b/packages/driver/src/cy/commands/location.ts
@@ -3,7 +3,7 @@ import _ from 'lodash'
 import $errUtils from '../../cypress/error_utils'
 
 export default (Commands, Cypress, cy) => {
-  Commands._addQuery('url', function url (options: Partial<Cypress.UrlOptions> = {}) {
+  Commands.addQuery('url', function url (options: Partial<Cypress.UrlOptions> = {}) {
     this.set('timeout', options.timeout)
 
     options.log !== false && Cypress.log({ message: '', timeout: options.timeout })
@@ -15,7 +15,7 @@ export default (Commands, Cypress, cy) => {
     }
   })
 
-  Commands._addQuery('hash', function url (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
+  Commands.addQuery('hash', function url (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
     this.set('timeout', options.timeout)
 
     options.log !== false && Cypress.log({ message: '', timeout: options.timeout })
@@ -23,7 +23,7 @@ export default (Commands, Cypress, cy) => {
     return () => cy.getRemoteLocation('hash')
   })
 
-  Commands._addQuery('location', function location (key, options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
+  Commands.addQuery('location', function location (key, options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
     // normalize arguments allowing key + options to be undefined
     // key can represent the options
     if (_.isObject(key)) {
diff --git a/packages/driver/src/cy/commands/misc.ts b/packages/driver/src/cy/commands/misc.ts
index c1862470f755..b4efd916742e 100644
--- a/packages/driver/src/cy/commands/misc.ts
+++ b/packages/driver/src/cy/commands/misc.ts
@@ -11,9 +11,9 @@ interface InternalWrapOptions extends Partial<Cypress.Loggable & Cypress.Timeout
 }
 
 export default (Commands, Cypress, cy, state) => {
-  Commands._addQuery('end', () => () => null)
+  Commands.addQuery('end', () => () => null)
 
-  Commands._addQuery('log', (msg, ...args) => {
+  Commands.addQuery('log', (msg, ...args) => {
     Cypress.log({
       end: true,
       snapshot: true,
diff --git a/packages/driver/src/cy/commands/querying/focused.ts b/packages/driver/src/cy/commands/querying/focused.ts
index e7059062ed0b..6a98a1bda82d 100644
--- a/packages/driver/src/cy/commands/querying/focused.ts
+++ b/packages/driver/src/cy/commands/querying/focused.ts
@@ -1,13 +1,15 @@
 import $dom from '../../../dom'
 
 export default (Commands, Cypress, cy, state) => {
-  Commands._addQuery('focused', function focused (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
+  Commands.addQuery('focused', function focused (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
     const log = options.log !== false && Cypress.log({ timeout: options.timeout })
 
+    this.set('timeout', options.timeout)
+
     return () => {
       let $el = cy.getFocused()
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         $el,
         consoleProps: () => {
           return {
diff --git a/packages/driver/src/cy/commands/querying/querying.ts b/packages/driver/src/cy/commands/querying/querying.ts
index b2d382bdf7bf..7c31351dd036 100644
--- a/packages/driver/src/cy/commands/querying/querying.ts
+++ b/packages/driver/src/cy/commands/querying/querying.ts
@@ -57,7 +57,7 @@ function getAlias (selector, log, cy) {
 
     const { command } = aliasObj
 
-    log && log.set('referencesAlias', { name: alias })
+    log && cy.state('current') === this && log.set('referencesAlias', { name: alias })
 
     /*
      * There are three cases for aliases, each explained in more detail below:
@@ -71,7 +71,7 @@ function getAlias (selector, log, cy) {
       // and returns one or more requests.
       const requests = cy.getRequestsByAlias(alias) || null
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         aliasType: 'route',
         consoleProps: () => {
           return {
@@ -97,7 +97,7 @@ function getAlias (selector, log, cy) {
 
       const returnValue = index === 'all' ? requests : (requests[parseInt(index, 10)] || null)
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         aliasType: 'intercept',
         consoleProps: () => {
           return {
@@ -128,7 +128,7 @@ function getAlias (selector, log, cy) {
     cy.state('aliasCurrentCommand', undefined)
 
     if ($dom.isElement(subject)) {
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         aliasType: 'dom',
         consoleProps: () => {
           return {
@@ -139,7 +139,7 @@ function getAlias (selector, log, cy) {
         },
       })
     } else {
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         aliasType: 'primitive',
         consoleProps: () => {
           return {
@@ -155,7 +155,7 @@ function getAlias (selector, log, cy) {
 }
 
 export default (Commands, Cypress, cy, state) => {
-  Commands._addQuery('get', function get (selector, userOptions: GetOptions = {}) {
+  Commands.addQuery('get', function get (selector, userOptions: GetOptions = {}) {
     if ((userOptions === null) || _.isArray(userOptions) || !_.isPlainObject(userOptions)) {
       $errUtils.throwErrByPath('get.invalid_options', {
         args: { options: userOptions },
@@ -176,7 +176,7 @@ export default (Commands, Cypress, cy, state) => {
       return getAlias.call(this, selector, log, cy)
     }
 
-    const withinSubject = cy.state('withinSubjectChain') || []
+    const withinSubject = cy.state('withinSubjectChain')
 
     const includeShadowDom = resolveShadowDomInclusion(Cypress, userOptions.includeShadowDom)
 
@@ -221,7 +221,7 @@ export default (Commands, Cypress, cy, state) => {
         throw err
       }
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         $el,
         consoleProps: () => {
           return {
@@ -236,7 +236,7 @@ export default (Commands, Cypress, cy, state) => {
     }
   })
 
-  Commands._addQuery('contains', function contains (filter, text, userOptions: ContainsOptions = {}) {
+  Commands.addQuery('contains', function contains (filter, text, userOptions: ContainsOptions = {}) {
     if (_.isRegExp(text)) {
       // .contains(filter, text)
       // Do nothing
@@ -351,7 +351,7 @@ export default (Commands, Cypress, cy, state) => {
         $el = $dom.getFirstDeepestElement($el)
       }
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         $el,
         consoleProps: () => {
           return {
@@ -367,7 +367,7 @@ export default (Commands, Cypress, cy, state) => {
     }
   })
 
-  Commands._addQuery('shadow', function contains (userOptions: ShadowOptions = {}) {
+  Commands.addQuery('shadow', function contains (userOptions: ShadowOptions = {}) {
     const log = userOptions.log !== false && Cypress.log({
       timeout: userOptions.timeout,
       consoleProps: () => ({}),
@@ -396,7 +396,7 @@ export default (Commands, Cypress, cy, state) => {
       .map((i, node) => node.shadowRoot)
       .filter((i, node) => node !== undefined && node !== null)
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         $el,
         consoleProps: () => {
           return {
diff --git a/packages/driver/src/cy/commands/querying/root.ts b/packages/driver/src/cy/commands/querying/root.ts
index 6f97635be008..c5e5a3d62532 100644
--- a/packages/driver/src/cy/commands/querying/root.ts
+++ b/packages/driver/src/cy/commands/querying/root.ts
@@ -1,5 +1,5 @@
 export default (Commands, Cypress, cy, state) => {
-  Commands._addQuery('root', function root (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
+  Commands.addQuery('root', function root (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
     const log = options.log !== false && Cypress.log({
       timeout: options.timeout,
     })
@@ -13,7 +13,7 @@ export default (Commands, Cypress, cy, state) => {
 
       const $el = cy.getSubjectFromChain(withinSubject || [cy.$$('html')])
 
-      log && log.set({
+      log && cy.state('current') === this && log.set({
         $el,
         consoleProps: () => {
           return {
diff --git a/packages/driver/src/cy/commands/querying/within.ts b/packages/driver/src/cy/commands/querying/within.ts
index 6153cdf9c278..e8a61f4b8506 100644
--- a/packages/driver/src/cy/commands/querying/within.ts
+++ b/packages/driver/src/cy/commands/querying/within.ts
@@ -19,7 +19,7 @@ export default (Commands, Cypress, cy, state) => {
     // once its done
     const prevWithinSubject = state('withinSubjectChain')
 
-    state('withinSubjectChain', state('subjects')[current.get('chainerId')])
+    state('withinSubjectChain', cy.subjectChain())
 
     // https://github.com/cypress-io/cypress/pull/8699
     // An internal command is inserted to create a divider between
diff --git a/packages/driver/src/cy/commands/screenshot.ts b/packages/driver/src/cy/commands/screenshot.ts
index 69d747ed8550..4153d85fba5b 100644
--- a/packages/driver/src/cy/commands/screenshot.ts
+++ b/packages/driver/src/cy/commands/screenshot.ts
@@ -528,7 +528,7 @@ export default function (Commands, Cypress, cy, state, config) {
       // we are not limited to "within" subject
       // https://github.com/cypress-io/cypress/issues/14253
       if (userOptions.capture !== 'runner') {
-        const withinSubject = cy.getSubjectFromChain(cy.state('withinSubjectChain') || [])
+        const withinSubject = cy.getSubjectFromChain(cy.state('withinSubjectChain'))
 
         if ($dom.isElement(withinSubject)) {
           subject = withinSubject
diff --git a/packages/driver/src/cy/commands/traversals.ts b/packages/driver/src/cy/commands/traversals.ts
index 8c654cf3d559..f62bd8fc39d1 100644
--- a/packages/driver/src/cy/commands/traversals.ts
+++ b/packages/driver/src/cy/commands/traversals.ts
@@ -79,7 +79,7 @@ export default (Commands, Cypress, cy) => {
   }
 
   _.each(traversals, (traversal) => {
-    Commands._addQuery(traversal, function traversalFn (arg1, arg2, userOptions: TraversalOptions = {}) {
+    Commands.addQuery(traversal, function traversalFn (arg1, arg2, userOptions: TraversalOptions = {}) {
       if (_.isObject(arg1) && !_.isFunction(arg1)) {
         userOptions = arg1
       }
@@ -102,8 +102,7 @@ export default (Commands, Cypress, cy) => {
       this.set('onFail', (err) => {
         switch (err.type) {
           case 'existence': {
-            const chainerId = this.get('chainerId')
-            const subjectChain = (cy.state('subjects') || {})[chainerId]
+            const subjectChain = cy.subjectChain(this.get('chainerId'))
 
             err.message += ` Queried from:
 
@@ -127,7 +126,7 @@ export default (Commands, Cypress, cy) => {
         // or completely borks it
         $el.selector = selector || traversal
 
-        log && log.set({
+        log && cy.state('current') === this && log.set({
           $el,
           consoleProps: () => {
             return {
diff --git a/packages/driver/src/cy/commands/window.ts b/packages/driver/src/cy/commands/window.ts
index d5f29246d24e..967dad490297 100644
--- a/packages/driver/src/cy/commands/window.ts
+++ b/packages/driver/src/cy/commands/window.ts
@@ -88,7 +88,7 @@ export default (Commands, Cypress, cy, state) => {
     })
   }
 
-  Commands._addQuery('title', function title (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
+  Commands.addQuery('title', function title (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
     this.set('timeout', options.timeout)
     if (options.log !== false) {
       Cypress.log({ timeout: options.timeout })
@@ -97,7 +97,7 @@ export default (Commands, Cypress, cy, state) => {
     return () => (state('document')?.title || '')
   })
 
-  Commands._addQuery('window', function windowFn (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
+  Commands.addQuery('window', function windowFn (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
     this.set('timeout', options.timeout)
     if (options.log !== false) {
       Cypress.log({ timeout: options.timeout })
@@ -114,7 +114,7 @@ export default (Commands, Cypress, cy, state) => {
     }
   })
 
-  Commands._addQuery('document', function documentFn (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
+  Commands.addQuery('document', function documentFn (options: Partial<Cypress.Loggable & Cypress.Timeoutable> = {}) {
     this.set('timeout', options.timeout)
     if (options.log !== false) {
       Cypress.log({ timeout: options.timeout })
diff --git a/packages/driver/src/cy/ensures.ts b/packages/driver/src/cy/ensures.ts
index 80be1b5e8f9e..68fc8c24b728 100644
--- a/packages/driver/src/cy/ensures.ts
+++ b/packages/driver/src/cy/ensures.ts
@@ -110,9 +110,7 @@ export const create = (state: StateFunc, expect: $Cy['expect']) => {
   }
 
   const ensureChildCommand = (command, args) => {
-    const subjects = cy.state('subjects')
-
-    if (subjects[command.get('chainerId')] === undefined) {
+    if (cy.subjectChain(command.get('chainerId')) === undefined) {
       const stringifiedArg = $utils.stringifyActual(args[0])
 
       $errUtils.throwErrByPath('miscellaneous.invoking_child_without_parent', {
@@ -208,14 +206,12 @@ export const create = (state: StateFunc, expect: $Cy['expect']) => {
     if ($dom.isDetached(subject)) {
       const current = state('current')
 
-      const cmd = name ?? current.get('name')
-
-      const prev = current.get('prev') ? current.get('prev').get('name') : current.get('name')
-      const node = $dom.stringify(subject)
+      name = name ?? current.get('name')
+      const subjectChain = cy.subjectChain(current.get('chainerId'))
 
-      $errUtils.throwErrByPath('subject.not_attached', {
+      $errUtils.throwErrByPath('subject.detached_after_command', {
         onFail,
-        args: { cmd, prev, node },
+        args: { name, subjectChain },
       })
     }
   }
@@ -225,15 +221,18 @@ export const create = (state: StateFunc, expect: $Cy['expect']) => {
       const current = state('current')
 
       if ($dom.isJquery(subject) && subject.length === 0) {
-        const subjectChain = (cy.state('subjects') || {})[current.get('chainerId')]
-
-        $errUtils.throwErrByPath('subject.not_element_empty_subject', {
-          onFail,
-          args: {
-            name: current.get('name'),
-            subjectChain,
-          },
-        })
+        const subjectChain = cy.subjectChain(current.get('chainerId'))
+        const prevCommandWasQuery = current.get('prev').get('query')
+
+        if (prevCommandWasQuery) {
+          $errUtils.throwErrByPath('subject.not_element_empty_subject', {
+            onFail,
+            args: {
+              name: current.get('name'),
+              subjectChain,
+            },
+          })
+        }
       }
 
       $errUtils.throwErrByPath('subject.not_element', {
diff --git a/packages/driver/src/cypress.ts b/packages/driver/src/cypress.ts
index 15ac4bb4c001..b65734358e2f 100644
--- a/packages/driver/src/cypress.ts
+++ b/packages/driver/src/cypress.ts
@@ -239,7 +239,7 @@ class $Cypress {
       get: () => {
         $errUtils.warnByPath('subject.state_subject_deprecated')
 
-        return this.cy.currentSubject()
+        return this.cy.subject()
       },
     })
 
@@ -247,7 +247,7 @@ class $Cypress {
       get: () => {
         $errUtils.warnByPath('subject.state_withinsubject_deprecated')
 
-        return this.cy.getSubjectFromChain(this.cy.state('withinSubjectChain') || [])
+        return this.cy.getSubjectFromChain(this.cy.state('withinSubjectChain'))
       },
     })
 
diff --git a/packages/driver/src/cypress/command.ts b/packages/driver/src/cypress/command.ts
index 9abb27d41886..a23bd6a8711a 100644
--- a/packages/driver/src/cypress/command.ts
+++ b/packages/driver/src/cypress/command.ts
@@ -35,21 +35,13 @@ export class $Command {
     return this
   }
 
-  snapshotLogs () {
-    this.get('logs').forEach((log) => {
-      if (!log.get('snapshots')) {
-        log.snapshot()
-      }
-    })
-  }
-
   finishLogs () {
     // TODO: Investigate whether or not we can reuse snapshots between logs
     // that snapshot at the same time
 
     // Finish each of the logs we have, turning any potential errors into actual ones.
     this.get('logs').forEach((log) => {
-      if (log.get('next')) {
+      if (log.get('next') || !log.get('snapshots')) {
         log.snapshot()
       }
 
@@ -60,14 +52,6 @@ export class $Command {
         log.finish()
       }
     })
-
-    // If the previous command is a query belonging to the same chainer,
-    // we also ask it to end its own logs (and so on, up the chain).
-    const prev = this.get('prev')
-
-    if (prev && prev.get('query') && prev.get('chainerId') === this.get('chainerId')) {
-      prev.finishLogs()
-    }
   }
 
   log (log) {
diff --git a/packages/driver/src/cypress/command_queue.ts b/packages/driver/src/cypress/command_queue.ts
index cb9637b7df4b..9611321ea54d 100644
--- a/packages/driver/src/cypress/command_queue.ts
+++ b/packages/driver/src/cypress/command_queue.ts
@@ -92,7 +92,7 @@ function retryQuery (command: $Command, ret: any, cy: $Cy) {
       onFail: command.get('onFail'),
       ensureExistenceFor: command.get('ensureExistenceFor'),
       subjectFn: () => {
-        const subject = cy.currentSubject(command.get('chainerId'))
+        const subject = cy.subject(command.get('chainerId'))
 
         cy.ensureSubjectByType(subject, command.get('prevSubject'), command)
 
@@ -305,11 +305,7 @@ export class CommandQueue extends Queue<$Command> {
       }
 
       command.set({ subject })
-
-      // When a command - query or normal - first passes, we verify that we have any snapshots needed.
-      // The logs may still be pending, but we want to know the state of the DOM now, before any subsequent commands
-      // run to alter it.
-      command.snapshotLogs()
+      command.finishLogs()
 
       if (isQuery) {
         subject = command.get('queryFn')
@@ -325,17 +321,10 @@ export class CommandQueue extends Queue<$Command> {
 
         // This is done so that any query's logs remain in the 'pending' state until the subject chain is finished.
         this.cy.addQueryToChainer(command.get('chainerId'), subject)
-
-        const next = command.get('next')
-
-        if (!next || next.get('chainerId') !== command.get('chainerId') || !next.get('query')) {
-          command.finishLogs()
-        }
       } else {
         // For commands, the "subject" here is the command's return value, which replaces
         // the current subject chain. We cannot re-invoke commands - the return value here is final.
         this.cy.setSubjectForChainer(command.get('chainerId'), subject)
-        command.finishLogs()
       }
 
       // reset the nestedIndex back to null
diff --git a/packages/driver/src/cypress/commands.ts b/packages/driver/src/cypress/commands.ts
index c4008f8b4a27..c4e51904bafa 100644
--- a/packages/driver/src/cypress/commands.ts
+++ b/packages/driver/src/cypress/commands.ts
@@ -4,7 +4,7 @@ import { addCommand as addNetstubbingCommand } from '../cy/net-stubbing'
 import $errUtils from './error_utils'
 import $stackUtils from './stack_utils'
 
-import type { QueryFunction } from './utils'
+import type { QueryFunction } from './state'
 
 const PLACEHOLDER_COMMANDS = ['mount', 'hover']
 
@@ -157,7 +157,7 @@ export default {
         return cy.addCommand(overridden)
       },
 
-      _addQuery (name: string, fn: () => QueryFunction) {
+      addQuery (name: string, fn: () => QueryFunction) {
         if (reservedCommandNames.has(name)) {
           internalError('miscellaneous.reserved_command_query', name)
         }
@@ -171,11 +171,7 @@ export default {
         }
 
         queries[name] = fn
-        cy._addQuery({ name, fn })
-      },
-
-      _overwriteQuery (name, fn) {
-        cy._addQuery({ name, fn })
+        cy.addQuery({ name, fn })
       },
     }
 
diff --git a/packages/driver/src/cypress/cy.ts b/packages/driver/src/cypress/cy.ts
index 8e40ab6eeaa3..7978d53a8bf7 100644
--- a/packages/driver/src/cypress/cy.ts
+++ b/packages/driver/src/cypress/cy.ts
@@ -3,7 +3,7 @@ import _ from 'lodash'
 import Promise from 'bluebird'
 import debugFn from 'debug'
 
-import $utils, { SubjectChain } from './utils'
+import $utils from './utils'
 import $errUtils, { ErrorFromProjectRejectionEvent } from './error_utils'
 import $stackUtils from './stack_utils'
 
@@ -36,7 +36,7 @@ import { handleCrossOriginCookies } from '../cross-origin/events/cookies'
 
 import type { ICypress } from '../cypress'
 import type { ICookies } from './cookies'
-import type { StateFunc } from './state'
+import type { StateFunc, SubjectChain } from './state'
 
 const debugErrors = debugFn('cypress:driver:errors')
 
@@ -245,15 +245,17 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
     this.reset = this.reset.bind(this)
     this.addCommandSync = this.addCommandSync.bind(this)
     this.addCommand = this.addCommand.bind(this)
-    this._addQuery = this._addQuery.bind(this)
+    this.addQuery = this.addQuery.bind(this)
     this.now = this.now.bind(this)
     this.onBeforeAppWindowLoad = this.onBeforeAppWindowLoad.bind(this)
     this.onUncaughtException = this.onUncaughtException.bind(this)
     this.setRunnable = this.setRunnable.bind(this)
     this.cleanup = this.cleanup.bind(this)
-    this.setSubjectForChainer = this.setSubjectForChainer.bind(this)
-    this.currentSubject = this.currentSubject.bind(this)
+
     this.getSubjectFromChain = this.getSubjectFromChain.bind(this)
+    this.setSubjectForChainer = this.setSubjectForChainer.bind(this)
+    this.subject = this.subject.bind(this)
+    this.subjectChain = this.subjectChain.bind(this)
 
     // init traits
 
@@ -812,7 +814,7 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
     }
   }
 
-  _addQuery ({ name, fn }) {
+  addQuery ({ name, fn }) {
     const cy = this
 
     this.queryFns[name] = fn
@@ -1243,7 +1245,7 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
 
   // TODO: make string[] more
   private pushSubject (name, args, prevSubject: string[], chainerId) {
-    const subject = this.currentSubject(chainerId)
+    const subject = this.subject(chainerId)
 
     if (prevSubject !== undefined) {
       // make sure our current subject is valid for
@@ -1257,9 +1259,23 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
   }
 
   /*
-   * Use `currentSubject()` to get the subject. It reads from cy.state('subjects'), but the format and details of
+   * Use `subject()` to get the current subject. It reads from cy.state('subjects'), but the format and details of
    * determining this should be considered an internal implementation detail of Cypress, subject to change at any time.
    *
+   * See subjectChain() for more details on state('subjects').
+   */
+  subject (chainerId?: string) {
+    const subjectChain: SubjectChain | undefined = this.subjectChain(chainerId)
+
+    return this.getSubjectFromChain(subjectChain)
+  }
+
+  /*
+   * Use subjectChain() to get a subjectChain, which you can later pass into getSubjectFromChain() to resolve
+   * the array into a specific DOM element or other value. It reads from cy.state('subjects'), but the format and
+   * details of determining this should be considered an internal implementation detail of Cypress, subject to change
+   * at any time.
+   *
    * Currently, state('subjects') is an object, mapping chainerIds to the current subject and queries for that
    * chainer. For example, it might look like:
    *
@@ -1269,25 +1285,27 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
    *   'ch-http://localhost:3500-4': [undefined, f(), f()],
    * }
    *
-   * Do not read cy.state('subjects') directly; This is what currentSubject() is for, turning this structure into a
-   * usable subject.
+   * A subject chain - the return value of this function - is one of these entries: a primitive value, followed by
+   * 0 or more functions operating on this value.
+   *
+   * Do not read cy.state('subjects') directly; This is what subject() or subjectChain() are for, turning this
+   * structure into a usable subject.
    */
-  currentSubject (chainerId: string = this.state('chainerId')) {
-    const subjectChain: SubjectChain | undefined = (this.state('subjects') || {})[chainerId]
-
-    if (subjectChain) {
-      return this.getSubjectFromChain(subjectChain)
-    }
-
-    return undefined
+  subjectChain (chainerId: string = this.state('chainerId')) {
+    return (this.state('subjects') || {} as Record<string, SubjectChain>)[chainerId]
   }
 
   /* Given a chain of functions, return the actual subject. `subjectChain` might look like any of:
+   * []
    * [<input>]
    * ['foobar', f()]
    * [undefined, f(), f()]
    */
-  getSubjectFromChain (subjectChain: SubjectChain) {
+  getSubjectFromChain (subjectChain: SubjectChain | null | undefined) {
+    if (!subjectChain) {
+      return
+    }
+
     // If we're getting the subject of a previous command, then any log messages have already
     // been added to the command log; We don't want to re-add them every time we query
     // the current subject.
@@ -1336,7 +1354,7 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
    * instead use the return value as the new subject. Is this case, you'll want cy.breakSubjectLinksToCurrentChainer().
    */
   linkSubject (childChainerId: string, parentChainerId: string) {
-    const links = this.state('subjectLinks') || {}
+    const links = this.state('subjectLinks') || {} as Record<string, string>
 
     links[childChainerId] = parentChainerId
     this.state('subjectLinks', links)
@@ -1352,7 +1370,7 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
    */
   breakSubjectLinksToCurrentChainer () {
     const chainerId = this.state('chainerId')
-    const links = this.state('subjectLinks') || {}
+    const links = this.state('subjectLinks') || {} as Record<string, string>
 
     this.state('subjectLinks', _.omitBy(links, (l) => l === chainerId))
   }
@@ -1367,12 +1385,12 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
    * new subject for any chainers it's linked to (see cy.linkSubject for details on that process).
    */
   setSubjectForChainer (chainerId: string, subject: any) {
-    const cySubjects = this.state('subjects') || {}
+    const cySubjects = this.state('subjects') || {} as Record<string, SubjectChain>
 
     cySubjects[chainerId] = [subject]
     this.state('subjects', cySubjects)
 
-    const links = this.state('subjectLinks') || {}
+    const links = this.state('subjectLinks') || {} as Record<string, string>
 
     if (links[chainerId]) {
       this.setSubjectForChainer(links[chainerId], subject)
@@ -1386,10 +1404,10 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
    *
    * The command_queue calls addQueryToChainer after a query returns a function. This function is
    * is appended to the subject chain (which begins with 'undefined' if no previous subject exists), and used
-   * to resolve cy.currentSubject() as needed.
+   * to resolve cy.subject() as needed.
    */
   addQueryToChainer (chainerId: string, queryFn: (subject: any) => any) {
-    const cySubjects = this.state('subjects') || {}
+    const cySubjects = this.state('subjects') || {} as Record<string, SubjectChain>
 
     const subject = (cySubjects[chainerId] || [undefined]) as SubjectChain
 
@@ -1397,7 +1415,7 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
     cySubjects[chainerId] = subject
     this.state('subjects', cySubjects)
 
-    const links = this.state('subjectLinks') || {}
+    const links = this.state('subjectLinks') || {} as Record<string, string>
 
     if (links[chainerId]) {
       this.addQueryToChainer(links[chainerId], queryFn)
diff --git a/packages/driver/src/cypress/error_messages.ts b/packages/driver/src/cypress/error_messages.ts
index 66dc45d12174..ded65f0923da 100644
--- a/packages/driver/src/cypress/error_messages.ts
+++ b/packages/driver/src/cypress/error_messages.ts
@@ -59,7 +59,7 @@ const queryFnToString = (queryFn) => `.${queryFn.commandName}(${queryFn.args.map
 export const subjectChainToString = (subjectChain) => {
   const [initial, ...queryFns] = subjectChain
 
-  const prefix = initial == null ? 'cy' : `${$utils.stringifyActual(initial)} -> `
+  const prefix = initial == null ? 'cy' : `${$utils.stringifyActual(initial)}${queryFns.length ? ' -> ' : ''}`
 
   return prefix + queryFns.map(queryFnToString).join('')
 }
@@ -143,28 +143,6 @@ export default {
     },
   },
 
-  selectFile: {
-    docsUrl: 'https://on.cypress.io/selectfile',
-    invalid_action: {
-      message: `${cmd('selectFile')} \`action\` can only be \`select\` or \`drag-drop\`. You passed: \`{{action}}\`.`,
-    },
-    invalid_array_file_reference: {
-      message: `${cmd('selectFile')} must be passed an array of Buffers or objects with non-null \`contents\`. At files[{{index}}] you passed: \`{{file}}\`.`,
-    },
-    invalid_single_file_reference: {
-      message: `${cmd('selectFile')} must be passed a Buffer or an object with a non-null \`contents\` property as its 1st argument. You passed: \`{{file}}\`.`,
-    },
-    multiple_elements: {
-      message: `${cmd('selectFile')} can only be called on a single element. Your subject contained {{num}} elements.`,
-    },
-    not_file_input: {
-      message: `${cmd('selectFile')} can only be called on an \`<input type="file">\` or a \`<label for="fileInput">\` pointing to or containing one. Your subject is: \`{{node}}\`.`,
-    },
-    invalid_alias: {
-      message: `${cmd('selectFile')} can only attach strings, Buffers or objects, while your alias \`{{alias}}\` resolved to: \`{{subject}}\`.`,
-    },
-  },
-
   blur: {
     docsUrl: 'https://on.cypress.io/blur',
     multiple_elements: {
@@ -873,11 +851,11 @@ export default {
       docsUrl: 'https://on.cypress.io/custom-commands',
     },
     invalid_new_query: {
-      message: '`Cypress.Commands._addQuery()` is used to create new queries, but `{{name}}` is an existing Cypress command or query, or is reserved internally by Cypress.\n\n If you want to override an existing command or query, use `Cypress.Commands.overrideQuery()` instead.',
+      message: '`Cypress.Commands.addQuery()` is used to create new queries, but `{{name}}` is an existing Cypress command or query, or is reserved internally by Cypress.\n\n If you want to override an existing command or query, use `Cypress.Commands.overrideQuery()` instead.',
       docsUrl: 'https://on.cypress.io/custom-commands',
     },
     reserved_command_query: {
-      message: '`Cypress.Commands._addQuery()` cannot create a new query named `{{name}}` because that name is reserved internally by Cypress.',
+      message: '`Cypress.Commands.addQuery()` cannot create a new query named `{{name}}` because that name is reserved internally by Cypress.',
       docsUrl: 'https://on.cypress.io/custom-commands',
     },
     invalid_overwrite: {
@@ -885,7 +863,7 @@ export default {
       docsUrl: 'https://on.cypress.io/api',
     },
     invalid_overwrite_query_with_command: {
-      message: 'Cannot overwite the `{{name}}` query with a command. Use `Commands._overwriteQuery()` instead.',
+      message: 'Cannot overwite the `{{name}}` query. Queries cannot be overwritten.',
       docsUrl: 'https://on.cypress.io/api',
     },
     invoking_child_without_parent (obj) {
@@ -1618,10 +1596,6 @@ export default {
       message: `${cmd('select')} must be passed an array containing only strings and/or numbers. You passed: \`{{value}}\`.`,
       docsUrl: 'https://on.cypress.io/select',
     },
-    disabled: {
-      message: `${cmd('select')} failed because this element is currently disabled:\n\n\`{{node}}\``,
-      docsUrl: 'https://on.cypress.io/select',
-    },
     invalid_element: {
       message: `${cmd('select')} can only be called on a \`<select>\`. Your subject is a: \`{{node}}\``,
       docsUrl: 'https://on.cypress.io/select',
@@ -1656,6 +1630,30 @@ export default {
     },
   },
 
+  selectFile: {
+    docsUrl: 'https://on.cypress.io/selectfile',
+    invalid_action: {
+      message: `${cmd('selectFile')} \`action\` can only be \`select\` or \`drag-drop\`. You passed: \`{{action}}\`.`,
+    },
+    invalid_array_file_reference: {
+      message: `${cmd('selectFile')} must be passed an array of Buffers or objects with non-null \`contents\`. At files[{{index}}] you passed: \`{{file}}\`.`,
+    },
+    invalid_single_file_reference: {
+      message: `${cmd('selectFile')} must be passed a Buffer or an object with a non-null \`contents\` property as its 1st argument. You passed: \`{{file}}\`.`,
+    },
+    multiple_elements: {
+      message: `${cmd('selectFile')} can only be called on a single element. Your subject contained {{num}} elements.`,
+    },
+    not_file_input: {
+      message: `${cmd('selectFile')} can only be called on an \`<input type="file">\` or a \`<label for="fileInput">\` pointing to or containing a file input, but received the element:
+      
+      \`{{node}}\`.`,
+    },
+    invalid_alias: {
+      message: `${cmd('selectFile')} can only attach strings, Buffers or objects, while your alias \`{{alias}}\` resolved to: \`{{subject}}\`.`,
+    },
+  },
+
   query_command: {
     docsUrl: 'https://on.cypress.io/custom-commands',
 
@@ -1880,26 +1878,49 @@ export default {
 
         Cypress only considers the \`window\`, \`document\`, or any \`element\` to be valid DOM objects.`
     },
-    not_attached (obj) {
+    detached_during_actionability (obj) {
       return {
         message: stripIndent`\
-          ${cmd(obj.cmd)} failed because this element is detached from the DOM.
+          ${cmd(obj.name)} failed because the page updated while this command was executing. Cypress tried to locate elements based on this query:
+
+          > ${subjectChainToString(obj.subjectChain)}
 
-          \`${obj.node}\`
+          We initially found matching element(s), but while waiting for them to become actionable, they disappeared from the page. Common situations why this happens:
+            - Your JS framework re-rendered asynchronously
+            - Your app code reacted to an event firing and removed the element
 
-          Cypress requires elements be attached in the DOM to interact with them.
+          You can typically solve this by breaking up a chain. For example, rewrite:
 
-          The previous command that ran was:
+          > \`cy.get('button').click().click()\`
 
-            > ${cmd(obj.prev)}
+          to
 
-          This DOM element likely became detached somewhere between the previous and current command.
+          > \`cy.get('button').as('btn').click()\`
+          > \`cy.get('@btn').click()\`
+
+            `,
+        docsUrl: 'https://on.cypress.io/element-has-detached-from-dom',
+      }
+    },
+    detached_after_command (obj) {
+      return {
+        message: stripIndent`\
+          ${cmd(obj.name)} failed because the page updated as a result of this command, but you tried to continue the command chain. The subject is no longer attached to the DOM, and Cypress cannot requery the page after commands such as ${cmd(obj.name)}.
 
           Common situations why this happens:
             - Your JS framework re-rendered asynchronously
             - Your app code reacted to an event firing and removed the element
 
-          You typically need to re-query for the element or add 'guards' which delay Cypress from running new commands.`,
+          You can typically solve this by breaking up a chain. For example, rewrite:
+
+          > \`cy.get('button').click().should('have.class', 'active')\`
+
+          to
+
+          > \`cy.get('button').as('btn').click()\`
+          > \`cy.get('@btn').should('have.class', 'active')\`
+
+            `,
         docsUrl: 'https://on.cypress.io/element-has-detached-from-dom',
       }
     },
@@ -1936,7 +1957,7 @@ export default {
           > ${subjectChainToString(obj.subjectChain)}`
     },
     state_subject_deprecated: {
-      message: `${cmd('state', '\'subject\'')} has been deprecated and will be removed in a future release. Consider migrating to ${cmd('currentSubject')} instead.`,
+      message: `${cmd('state', '\'subject\'')} has been deprecated and will be removed in a future release. Consider migrating to ${cmd('subject')} instead.`,
     },
     state_withinsubject_deprecated: {
       message: `${cmd('state', '\'withinSubject\'')} has been deprecated and will be removed in a future release. You should read ${cmd('state', '\'withinSubjectChain\'')} once at the top of your command / query, and resolve it into a value with ${cmd('getSubjectFromChain', 'withinSubjectChain')} as needed.`,
diff --git a/packages/driver/src/cypress/log.ts b/packages/driver/src/cypress/log.ts
index 4a66aab3b287..518556cfee07 100644
--- a/packages/driver/src/cypress/log.ts
+++ b/packages/driver/src/cypress/log.ts
@@ -168,7 +168,7 @@ const defaults = function (state: StateFunc, config, obj) {
     if (_.isFunction(obj.type)) {
       const chainerId = current && current.get('chainerId')
 
-      obj.type = obj.type(current, (state('subjects') || {})[chainerId])
+      obj.type = obj.type(current, cy.subjectChain(chainerId))
     }
   }
 
diff --git a/packages/driver/src/cypress/state.ts b/packages/driver/src/cypress/state.ts
index d417a72d39c2..a6723566a4fb 100644
--- a/packages/driver/src/cypress/state.ts
+++ b/packages/driver/src/cypress/state.ts
@@ -11,6 +11,10 @@ import type { MouseCoords } from '../cy/mouse'
 import type { Server } from './server'
 import type { LocationObject } from './location'
 
+export type QueryFunction = (any) => any
+
+export type SubjectChain = [any, ...QueryFunction[]]
+
 export interface StateFunc {
   (): Record<string, any>
   (v: Record<string, any>): Record<string, any>
@@ -44,13 +48,14 @@ export interface StateFunc {
   (k: 'mouseLastHoveredEl', v?: HTMLElement | null): HTMLElement | null
   (k: 'mouseCoords', v?: MouseCoords): MouseCoords
   (k: 'server', v?: Server): Server
+  (k: 'subjects', v?: Record<string, SubjectChain>): Record<string, SubjectChain>
+  (k: 'subjectLinks', v?: Record<string, string>): Record<string, string>
   (k: 'requests', v?: XHRRequest[]): XHRRequest[]
   (k: 'fetchPolyfilled', v?: boolean): boolean
   (k: 'nestedIndex', v?: number): number
   (k: 'chainerId', v?: string): string
   (k: 'ctx', v?: Mocha.Context): Mocha.Context
   (k: 'commandIntermediateValue', v?: any): any
-  (k: 'subject', v?: any): any
   (k: 'onPaused', v?: (fn: any) => void): (fn: any) => void
   (k: 'onCommandFailed', v?: (err: any, queue: any) => boolean): (err: any, queue: any) => boolean
   (k: 'promise', v?: Bluebird<unknown>): Bluebird<unknown>
diff --git a/packages/driver/src/cypress/utils.ts b/packages/driver/src/cypress/utils.ts
index 38d4d186940b..1a983dfc6f2f 100644
--- a/packages/driver/src/cypress/utils.ts
+++ b/packages/driver/src/cypress/utils.ts
@@ -8,10 +8,6 @@ import $dom from '../dom'
 import $jquery from '../dom/jquery'
 import { $Location } from './location'
 
-export type QueryFunction = (any) => any
-
-export type SubjectChain = [any, ...QueryFunction[]];
-
 const tagOpen = /\[([a-z\s='"-]+)\]/g
 const tagClosed = /\[\/([a-z]+)\]/g
 
@@ -403,28 +399,4 @@ export default {
   isPromiseLike (ret) {
     return ret && _.isFunction(ret.then)
   },
-
-  /* Given a chain of functions, return the actual subject. `subjectChain` might look like any of:
-   * [<input>]
-   * ['foobar', f()]
-   * [undefined, f(), f()]
-   */
-  getSubjectFromChain (subjectChain: SubjectChain, cy) {
-    // If we're getting the subject of a previous command, then any log messages have already
-    // been added to the command log; We don't want to re-add them every time we query
-    // the current subject.
-    cy.state('onBeforeLog', () => false)
-
-    let subject = subjectChain[0]
-
-    try {
-      for (let i = 1; i < subjectChain.length; i++) {
-        subject = subjectChain[i](subject)
-      }
-    } finally {
-      cy.state('onBeforeLog', null)
-    }
-
-    return subject
-  },
 }
diff --git a/packages/driver/src/dom/elements/utils.ts b/packages/driver/src/dom/elements/utils.ts
index 66238c2b0d33..6bfde6958060 100644
--- a/packages/driver/src/dom/elements/utils.ts
+++ b/packages/driver/src/dom/elements/utils.ts
@@ -43,6 +43,10 @@ export function switchCase (value, casesObj, defaultKey = 'default') {
 }
 
 export const stringify = (el, form = 'long') => {
+  if (_.isString(el)) {
+    return el
+  }
+
   // if we are formatting the window object
   if ($window.isWindow(el)) {
     return '<window>'
@@ -82,7 +86,7 @@ export const stringify = (el, form = 'long') => {
   const short = () => {
     const id = $el.prop('id')
     const klass = $el.attr('class')
-    let str = $el.prop('tagName').toLowerCase()
+    let str = $el.length ? $el.prop('tagName').toLowerCase() : el.selector
 
     if (id) {
       str += `#${id}`
diff --git a/packages/driver/types/internal-types-lite.d.ts b/packages/driver/types/internal-types-lite.d.ts
index 2079e2e0e41f..3c2d936292be 100644
--- a/packages/driver/types/internal-types-lite.d.ts
+++ b/packages/driver/types/internal-types-lite.d.ts
@@ -22,6 +22,7 @@ declare namespace Cypress {
      */
     getNextAlias: IAliases['getNextAlias']
     noop: <T>(v: T) => Cypress.Chainable<T>
+    now: <T>(string, v: T) => Cypress.Chainable<T>
     queue: CommandQueue
     retry: IRetries['retry']
     state: State
@@ -33,6 +34,7 @@ declare namespace Cypress {
     isStable: IStability['isStable']
     fail: (err: Error, options:{ async?: boolean }) => Error
     getRemoteLocation: ILocation['getRemoteLocation']
+    subjectChain: (chainerId?: string) => SubjectChain
 
     createSnapshot:  ISnapshots['createSnapshot']
     getStyles: ISnapshots['getStyles']
diff --git a/packages/frontend-shared/package.json b/packages/frontend-shared/package.json
index c21c7d1c145d..d78869fc4f07 100644
--- a/packages/frontend-shared/package.json
+++ b/packages/frontend-shared/package.json
@@ -27,7 +27,7 @@
     "@intlify/vite-plugin-vue-i18n": "2.4.0",
     "@percy/core": "^1.0.0-beta.48",
     "@percy/cypress": "^3.1.0",
-    "@testing-library/cypress": "8.0.0",
+    "@testing-library/cypress": "BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5",
     "@toycode/markdown-it-class": "1.2.3",
     "@types/faker": "5.5.8",
     "@urql/core": "2.4.4",
@@ -114,4 +114,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/launchpad/cypress/e2e/top-nav-launchpad.cy.ts b/packages/launchpad/cypress/e2e/top-nav-launchpad.cy.ts
index c3195cb0af98..cc0eb22825e9 100644
--- a/packages/launchpad/cypress/e2e/top-nav-launchpad.cy.ts
+++ b/packages/launchpad/cypress/e2e/top-nav-launchpad.cy.ts
@@ -115,7 +115,7 @@ describe('Launchpad Top Nav Workflows', () => {
       })
 
       it('hides dropdown when version in header is clicked', () => {
-        cy.findByTestId('cypress-update-popover').findByRole('button', { expanded: false }).as('topNavVersionButton').click()
+        cy.findByTestId('cypress-update-popover').findAllByRole('button').first().as('topNavVersionButton').click()
 
         cy.get('@topNavVersionButton').should('have.attr', 'aria-expanded', 'true')
 
@@ -504,7 +504,7 @@ describe('Launchpad Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
 
             cy.contains('http://127.0.0.1:0000/redirect-to-auth').should('be.visible')
@@ -536,7 +536,7 @@ describe('Launchpad Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
 
             cy.contains(loginText.titleFailed).should('be.visible')
@@ -586,7 +586,7 @@ describe('Launchpad Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).as('loginButton').click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
 
             cy.contains(loginText.titleFailed).should('be.visible')
@@ -623,7 +623,7 @@ describe('Launchpad Top Nav Workflows', () => {
             cy.findByRole('button', { name: 'Log in' }).as('loginButton').click()
           })
 
-          cy.findByRole('dialog', { name: 'Log in to Cypress' }).within(() => {
+          cy.findByRole('dialog').within(() => {
             cy.findByRole('button', { name: 'Log in' }).click()
             cy.contains(loginText.titleFailed).should('be.visible')
             cy.contains(loginText.bodyError).should('be.visible')
diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json
index 893e96373700..70b3c2d91281 100644
--- a/packages/launchpad/package.json
+++ b/packages/launchpad/package.json
@@ -28,7 +28,7 @@
     "@packages/frontend-shared": "0.0.0-development",
     "@percy/cypress": "^3.1.0",
     "@purge-icons/generated": "0.8.1",
-    "@testing-library/cypress": "8.0.0",
+    "@testing-library/cypress": "BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5",
     "@tooling/system-tests": "0.0.0-development",
     "@toycode/markdown-it-class": "1.2.3",
     "@types/dedent": "^0.7.0",
diff --git a/system-tests/projects/vite-ct-function-api/package.json b/system-tests/projects/vite-ct-function-api/package.json
index e8a658137278..7a05c136f290 100644
--- a/system-tests/projects/vite-ct-function-api/package.json
+++ b/system-tests/projects/vite-ct-function-api/package.json
@@ -5,7 +5,7 @@
   "dependencies": {},
   "devDependencies": {
     "@cypress/vite-dev-server": "file:../../../npm/vite-dev-server",
-    "@testing-library/cypress": "8.0.2",
+    "@testing-library/cypress": "BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5",
     "typescript": "4.2.3",
     "vite": "2.7.10"
   }
diff --git a/system-tests/projects/vite-ct-function-api/yarn.lock b/system-tests/projects/vite-ct-function-api/yarn.lock
index 68142e5b2ca4..a0e02aadcc10 100644
--- a/system-tests/projects/vite-ct-function-api/yarn.lock
+++ b/system-tests/projects/vite-ct-function-api/yarn.lock
@@ -35,14 +35,13 @@
   dependencies:
     debug "4.3.3"
     find-up "6.3.0"
-    get-port "5.1.1"
     local-pkg "0.4.1"
+    node-html-parser "5.3.3"
     pathe "0.2.0"
 
-"@testing-library/cypress@8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-8.0.2.tgz#b13f0ff2424dec4368b6670dfbfb7e43af8eefc9"
-  integrity "sha1-sT8P8kJN7ENotmcN+/t+Q6+O78k= sha512-KVdm7n37sg/A4e3wKMD4zUl0NpzzVhx06V9Tf0hZHZ7nrZ4yFva6Zwg2EFF1VzHkEfN/ahUzRtT1qiW+vuWnJw=="
+"@testing-library/cypress@BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5":
+  version "0.0.0-semantically-released"
+  resolved "https://codeload.github.com/BlueWinds/cypress-testing-library/tar.gz/119054b5963b0d2e064b13c5cc6fc9db32c8b7b5"
   dependencies:
     "@babel/runtime" "^7.14.6"
     "@testing-library/dom" "^8.1.0"
@@ -95,6 +94,11 @@ aria-query@^5.0.0:
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
   integrity "sha1-IQwhqvRpYT7oyaYsf4ZSXgWNtSw= sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg=="
 
+boolbase@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
+
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -136,6 +140,22 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI= sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
 
+css-select@^4.2.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
+  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^6.0.1"
+    domhandler "^4.3.1"
+    domutils "^2.8.0"
+    nth-check "^2.0.1"
+
+css-what@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
+
 debug@4.3.3:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
@@ -148,6 +168,41 @@ dom-accessibility-api@^0.5.9:
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.13.tgz#102ee5f25eacce09bdf1cfa5a298f86da473be4b"
   integrity "sha1-EC7l8l6szgm98c+lopj4baRzvks= sha512-R305kwb5CcMDIpSHUnLyIAp7SrSPBx6F0VfQFB3M75xVMHhXJJIdePYgbPPh1o57vCHNu5QztokWUPsLjWzFqw=="
 
+dom-serializer@^1.0.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
+domhandler@^4.2.0, domhandler@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
+  dependencies:
+    domelementtype "^2.2.0"
+
+domutils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
 esbuild-android-arm64@0.13.15:
   version "0.13.15"
   resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.15.tgz#3fc3ff0bab76fe35dd237476b5d2b32bb20a3d44"
@@ -279,11 +334,6 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
 
-get-port@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
-  integrity "sha1-BGntB1Y0ed5u+5hrrwU9zX1OMZM= sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ=="
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -301,6 +351,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
 is-core-module@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
@@ -340,6 +395,21 @@ nanoid@^3.3.1:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
   integrity "sha1-yJYi+vtDgc0iFCHGnsWFR6HuxVc= sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="
 
+node-html-parser@5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-5.3.3.tgz#2845704f3a7331a610e0e551bf5fa02b266341b6"
+  integrity sha512-ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw==
+  dependencies:
+    css-select "^4.2.1"
+    he "1.2.0"
+
+nth-check@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
+  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
+  dependencies:
+    boolbase "^1.0.0"
+
 p-limit@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
diff --git a/system-tests/projects/vite-ct-object-api/package.json b/system-tests/projects/vite-ct-object-api/package.json
index 367237a9404a..af2ab81f7245 100644
--- a/system-tests/projects/vite-ct-object-api/package.json
+++ b/system-tests/projects/vite-ct-object-api/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0-test",
   "private": true,
   "dependencies": {
-    "@testing-library/cypress": "8.0.2",
+    "@testing-library/cypress": "BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5",
     "ansi-regex": "4.1.1",
     "typescript": "4.2.3",
     "vite": "2.7.10"
diff --git a/system-tests/projects/vite-ct-object-api/yarn.lock b/system-tests/projects/vite-ct-object-api/yarn.lock
index 28c6fa9d7f51..60f1f982a41b 100644
--- a/system-tests/projects/vite-ct-object-api/yarn.lock
+++ b/system-tests/projects/vite-ct-object-api/yarn.lock
@@ -30,10 +30,9 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@testing-library/cypress@8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-8.0.2.tgz#b13f0ff2424dec4368b6670dfbfb7e43af8eefc9"
-  integrity sha512-KVdm7n37sg/A4e3wKMD4zUl0NpzzVhx06V9Tf0hZHZ7nrZ4yFva6Zwg2EFF1VzHkEfN/ahUzRtT1qiW+vuWnJw==
+"@testing-library/cypress@BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5":
+  version "0.0.0-semantically-released"
+  resolved "https://codeload.github.com/BlueWinds/cypress-testing-library/tar.gz/119054b5963b0d2e064b13c5cc6fc9db32c8b7b5"
   dependencies:
     "@babel/runtime" "^7.14.6"
     "@testing-library/dom" "^8.1.0"
diff --git a/yarn.lock b/yarn.lock
index c6e0cb0ca3ee..ec2c8f326033 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6012,10 +6012,9 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
-"@testing-library/cypress@8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-8.0.0.tgz#290d9bd7d60a3398e9fd965cb45764023f8fcc05"
-  integrity sha512-hx1YYzS6oqQTMiQcTCqoEpB/sYOZWXDDyPw1Akr+LVLDFLRbvOG/lLVI4wpb12dJ2AzPm5dYjLGh5w3hbx/mGQ==
+"@testing-library/cypress@BlueWinds/cypress-testing-library#119054b5963b0d2e064b13c5cc6fc9db32c8b7b5":
+  version "0.0.0-semantically-released"
+  resolved "https://codeload.github.com/BlueWinds/cypress-testing-library/tar.gz/119054b5963b0d2e064b13c5cc6fc9db32c8b7b5"
   dependencies:
     "@babel/runtime" "^7.14.6"
     "@testing-library/dom" "^8.1.0"