diff --git a/cypress/tests/integration/CompetingInterests.cy.js b/cypress/tests/integration/CompetingInterests.cy.js
index 63a07aa36ae..cb50dc48a03 100644
--- a/cypress/tests/integration/CompetingInterests.cy.js
+++ b/cypress/tests/integration/CompetingInterests.cy.js
@@ -33,7 +33,7 @@ describe('Data suite tests', function() {
 		cy.get('button:contains("Accept Review, Continue to Step #2")').click();
 		cy.get('button:contains("Continue to Step #3")').click();
 		cy.wait(2000); // Give TinyMCE control time to load
-		cy.get('textarea[id^="comments-"]').then(node => {
+		cy.get('textarea#reviewStep3Form-comments-control').then(node => {
 			cy.setTinyMceContent(node.attr('id'), 'This paper is suitable for publication.');
 		});
 		cy.get('button:contains("Submit Review")').click();
@@ -86,7 +86,7 @@ describe('Data suite tests', function() {
 		cy.get('button:contains("Accept Review, Continue to Step #2")').click();
 		cy.get('button:contains("Continue to Step #3")').click();
 		cy.wait(2000); // Give TinyMCE control time to load
-		cy.get('textarea[id^="comments-"]').then(node => {
+		cy.get('textarea#reviewStep3Form-comments-control').then(node => {
 			cy.setTinyMceContent(node.attr('id'), 'This paper is suitable for publication.');
 		});
 		cy.get('button:contains("Submit Review")').click();
diff --git a/lib/pkp b/lib/pkp
index b80f4956cd9..c71d1101439 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit b80f4956cd91fa6adfa0d8d7429e394f486b2387
+Subproject commit c71d11014393811fc4716e5bd8f0380ce427b0e9
diff --git a/lib/ui-library b/lib/ui-library
index 1caccc4f50e..81d9e538a24 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 1caccc4f50e3554cdcb802edf8c22c1ca72b71cb
+Subproject commit 81d9e538a24f872b74d68a43fd1a14566d5dd729