diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index ef296cee6dc..5afdd97b9f2 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -47,6 +47,7 @@
 	<migration class="PKP\migration\install\CategoriesMigration" />
 	<migration class="PKP\migration\install\HighlightsMigration" />
 	<migration class="APP\migration\install\MetricsMigration" />
+	<migration class="PKP\migration\install\EmailTemplateUserGroupAccessMigration"/>
 
 	<!-- Other install tasks -->
 	<code function="createData"/>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 315418e7f8a..5cc643d0f34 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -11,7 +11,7 @@
   *
   -->
 
-<install version="3.5.0.0">
+<install version="3.6.0.0">
 	<code function="checkPhpVersion" />
 
 	<upgrade minversion="2.0.0.0" maxversion="3.2.9.9">
@@ -152,6 +152,9 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\COA75_AddUserRoleEndEmail"/>
 	</upgrade>
 
+	<upgrade minversion="3.5.0.0" maxversion="3.5.0.0">
+		<migration class="PKP\migration\upgrade\v3_6_0\I10403_EmailTemplateUserGroupAccess"/>
+	</upgrade>
 	<!-- update plugin configuration - should be done as the final upgrade task -->
 	<code function="addPluginVersions" />
 </install>
diff --git a/lib/pkp b/lib/pkp
index 444c7ac2aba..ba47e2bcdfa 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 444c7ac2aba4360512e144c1dfbf49751fc96784
+Subproject commit ba47e2bcdfa3a494ed6c24168db6e70f66da9ac0
diff --git a/lib/ui-library b/lib/ui-library
index d05618830e4..73567507358 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit d05618830e4ecf937a7fd8037a404d9132351363
+Subproject commit 735675073589cbf65edd148c393795a81185c878