this PR is mostly reverting commit 113b613 which caused a regression as shown in issue #914, we'll have to investigate on how to reapply the change in the future without regressing
add Cypress E2E tests covering the regression shown in referenced issue