diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 612592f503..ebf8952483 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -123,6 +123,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I9860_EditorialMastheadNavMenuItem"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I8826_AddMissingForeignKeys" />
 		<migration class="APP\migration\upgrade\v3_5_0\I9937_EditorialTeamToEditorialHistory"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10041_UserGroupsAndUserUserGroupsMastheadValues"/>
 	</upgrade>
 
 	<!-- Update plugin configuration - should be done as the final upgrade task -->
diff --git a/lib/pkp b/lib/pkp
index c1d2b2dca1..2ebd23fb14 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit c1d2b2dca135f19242a16118a76d4cbc8350687e
+Subproject commit 2ebd23fb1444eafb292bc7c9f1303261240232ca