diff --git a/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js b/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js
index 9c3e009c44f..5d3ca20746d 100644
--- a/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js
+++ b/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js
@@ -84,9 +84,9 @@ describe('Data suite tests', function() {
 		cy.get('#indexing button').contains('Save').click();
 		cy.get('#indexing [role="status"]').contains('Saved');
 
-		cy.get('label[for="searchIndexing-searchDescription-control-en"] ~ button.tooltipButton').click();
+		cy.get('label[for="searchIndexing-searchDescription-control-en"] ~ span.tooltipButton').click();
 		cy.get('div').contains('Provide a brief description');
-		cy.get('label[for="searchIndexing-searchDescription-control-en"] ~ button.tooltipButton').click();
+		cy.get('label[for="searchIndexing-searchDescription-control-en"] ~ span.tooltipButton').click();
 	});
 
 	it('Tests context settings form', function() {
diff --git a/lib/pkp b/lib/pkp
index bf64b629ef0..c3916abcc56 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit bf64b629ef06e515d4a1177142210d3cafc96681
+Subproject commit c3916abcc5632ed936db0c3dd4fa13cfb3bd0f57
diff --git a/lib/ui-library b/lib/ui-library
index a0ab8c6ea93..ca1358e7881 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit a0ab8c6ea9394b58a0afdd20bea03cc0a4058664
+Subproject commit ca1358e7881b72ebfdc852c76ca2f1a1153346d7