diff --git a/cypress/tests/integration/emailTemplates/emailTemplates.cy.js b/cypress/tests/integration/emailTemplates/emailTemplates.cy.js
deleted file mode 100644
index d8375d0d4e6..00000000000
--- a/cypress/tests/integration/emailTemplates/emailTemplates.cy.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * @file cypress/tests/integration/emailTemplates/emailTemplates.cy.js
- *
- * Copyright (c) 2014-2025 Simon Fraser University
- * Copyright (c) 2000-2025 John Willinsky
- * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
- *
- */
-
-// TODO: Email templates are no longer shown in the new Discussion Manager form.
-// These tests need to be updated to verify email template access elsewhere.
-describe.skip('Email Template Access Tests', function() {
- it('Checks that user cannot access restricted template not assigned to their group', () => {
- cy.login('admin', 'admin', 'publicknowledge');
- cy.visit('/index.php/publicknowledge/management/settings/manageEmails');
-
- cy.openEmailTemplate('Discussion (Copyediting)', 'Discussion (Copyediting)');
- // Remove all existing access
- cy.setEmailTemplateUnrestrictedTo(false);
- cy.get('input[name="assignedUserGroupIds"]')
- .as('checkboxes')
- .uncheck({force: true});
-
- cy.get('[data-cy="active-modal"]').within(() => {
- cy.contains('button', 'Save').click();
- });
- cy.logout();
-
- // Login as user without access - copyeditor
- cy.login('svogt');
- cy.visit(
- 'index.php/publicknowledge/en/dashboard/editorial?currentViewId=assigned-to-me'
- );
- cy.contains('button', 'View').first().click();
- cy.contains('a', 'Copyediting').click();
- cy.contains('a', 'Add discussion').click();
-
- cy.get('select#template').find('option').contains('Discussion (Copyediting)').should('not.exist');
- });
-
- it('Checks that user can access unrestricted template not specifically assigned to their group', () => {
- cy.login('admin', 'admin', 'publicknowledge');
- cy.visit('/index.php/publicknowledge/management/settings/manageEmails');
-
- cy.openEmailTemplate('Discussion (Copyediting)', 'Discussion (Copyediting)');
-
- cy.get('input[name="assignedUserGroupIds"]')
- .as('checkboxes')
- .uncheck({force: true});
-
- cy.get('[data-cy="active-modal"]').within(() => {
- cy.contains('button', 'Save').click();
- });
- cy.reload();
-
- cy.openEmailTemplate('Discussion (Copyediting)', 'Discussion (Copyediting)');
-
- cy.setEmailTemplateUnrestrictedTo(true);
-
- cy.get('[data-cy="active-modal"]').within(() => {
- cy.contains('button', 'Save').click();
- });
- cy.logout();
-
- // Login as user with access - copyeditor
- cy.login('svogt');
- cy.visit(
- 'index.php/publicknowledge/en/dashboard/editorial?currentViewId=assigned-to-me'
- );
- cy.contains('button', 'View').first().click();
- cy.contains('a', 'Copyediting').click();
- cy.contains('a', 'Add discussion').click();
-
- cy.get('select#template').find('option').contains('Discussion (Copyediting)').should('to.exist');
- });
-
- it('Checks that user can access template assigned to their group', () => {
- cy.login('admin', 'admin', 'publicknowledge');
- cy.visit('/index.php/publicknowledge/management/settings/manageEmails');
-
- cy.openEmailTemplate('Discussion (Copyediting)', 'Discussion (Copyediting)');
- cy.setEmailTemplateUnrestrictedTo(false);
- cy.contains('label', 'Copyeditor').find('input[type="checkbox"]').check({force: true});
- cy.get('[data-cy="active-modal"]').within(() => {
- cy.contains('button', 'Save').click();
- });
- cy.logout();
-
- // Login as user with access - copyeditor
- cy.login('svogt');
- cy.visit(
- 'index.php/publicknowledge/en/dashboard/editorial?currentViewId=assigned-to-me'
- );
- cy.contains('button', 'View').first().click();
- cy.contains('a', 'Copyediting').click();
- cy.contains('a', 'Add discussion').click();
-
- cy.get('select#template').find('option').contains('Discussion (Copyediting)').should('to.exist');
- });
-});
diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index bab43b12e54..88738eca5fe 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -54,7 +54,6 @@
-
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 978d9540178..498557cecb9 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -177,7 +177,6 @@
-
diff --git a/lib/pkp b/lib/pkp
index 4490934dc6b..072e97b8057 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 4490934dc6b2ae79838911ff06dffda33c1fa0d1
+Subproject commit 072e97b8057cf9286c16ddc27e736065473a7d1b
diff --git a/lib/ui-library b/lib/ui-library
index 9a86fc88447..ffe8dee8174 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 9a86fc884476d0f0d344a29d401bbb113029f0d5
+Subproject commit ffe8dee8174eaddd2bfa5bff4521234ce966696d