diff --git a/classes/components/forms/dashboard/SubmissionFilters.php b/classes/components/forms/dashboard/SubmissionFilters.php
index 6cb1040e103..217e8ea9d6e 100644
--- a/classes/components/forms/dashboard/SubmissionFilters.php
+++ b/classes/components/forms/dashboard/SubmissionFilters.php
@@ -15,11 +15,11 @@
 
 namespace APP\components\forms\dashboard;
 
+use APP\components\forms\FieldSelectIssues;
+use APP\core\Application;
 use Illuminate\Support\LazyCollection;
 use PKP\components\forms\dashboard\PKPSubmissionFilters;
 use PKP\context\Context;
-use APP\components\forms\FieldSelectIssues;
-use APP\core\Application;
 
 class SubmissionFilters extends PKPSubmissionFilters
 {
diff --git a/cypress/tests/data/60-content/AmwandengaSubmission.cy.js b/cypress/tests/data/60-content/AmwandengaSubmission.cy.js
index b3bb98a8595..151ef5f4bbc 100644
--- a/cypress/tests/data/60-content/AmwandengaSubmission.cy.js
+++ b/cypress/tests/data/60-content/AmwandengaSubmission.cy.js
@@ -464,7 +464,9 @@ describe('Data suite: Amwandenga', function() {
 		cy.get('button').contains('Create New Version').click();
 		cy.contains('Are you sure you want to create a new version?');
 		cy.get('div[role=dialog]:contains("Create New Version")').get('button').contains('Yes').click();
-		cy.wait(3000);
+		
+		// Once there is 'in progress' overlay when creating new version this can be improved
+		cy.wait(10000);
 
 		// Toggle between versions
 		cy.get('button').contains('All Versions').click();
diff --git a/lib/pkp b/lib/pkp
index 058f4114291..ac4c7faa7b9 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 058f4114291457cbcc6c037112cf68943bdb203e
+Subproject commit ac4c7faa7b976dd8e316bfae1ac0e8ef76dc25c4
diff --git a/lib/ui-library b/lib/ui-library
index c551c556049..72d82f2cafa 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit c551c55604938c8627ebd31b2ea53bf0db379851
+Subproject commit 72d82f2cafa743455eab1ff1537ce85ac999a99e
diff --git a/pages/dashboard/DashboardHandlerNext.php b/pages/dashboard/DashboardHandlerNext.php
index 97318c691a1..0ff87f0517e 100644
--- a/pages/dashboard/DashboardHandlerNext.php
+++ b/pages/dashboard/DashboardHandlerNext.php
@@ -16,11 +16,11 @@
 namespace APP\pages\dashboard;
 
 use APP\components\forms\dashboard\SubmissionFilters;
+use APP\core\Application;
 use APP\core\Request;
 use APP\facades\Repo;
 use APP\template\TemplateManager;
 use PKP\pages\dashboard\PKPDashboardHandlerNext;
-use APP\core\Application;
 
 class_exists(\APP\components\forms\publication\AssignToIssueForm::class); // Force define of FORM_ASSIGN_TO_ISSUE
 
@@ -43,8 +43,8 @@ public function setupIndex($request)
         $paymentManager = Application::get()->getPaymentManager($context);
 
         $pageInitConfig = $templateMgr->getState('pageInitConfig');
-        $pageInitConfig['publicationSettings']['submissionPaymentsEnabled'] =  $paymentManager->publicationEnabled();
-        $templateMgr->setState(["pageInitConfig" => $pageInitConfig]);
+        $pageInitConfig['publicationSettings']['submissionPaymentsEnabled'] = $paymentManager->publicationEnabled();
+        $templateMgr->setState(['pageInitConfig' => $pageInitConfig]);
 
         $templateMgr->setConstants([
             'FORM_ASSIGN_TO_ISSUE' => FORM_ASSIGN_TO_ISSUE