diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index 3f2bcd8dd0..881cd0d54c 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -10,7 +10,7 @@
   * Installation descriptor file.
   -->
 
-<install version="3.5.0.0">
+<install version="3.6.0.0">
 	<code function="checkPhpVersion" />
 
 	<code function="createDirectories" />
@@ -49,6 +49,7 @@
 	<migration class="APP\migration\install\MetricsMigration" />
 
 	<migration class="APP\migration\install\SeriesCategoriesMigration" />
+	<migration class="PKP\migration\install\EmailTemplateUserGroupAccessMigration"/>
 
 	<code function="createData" />
 	<code function="createConfig" />
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index b030e84d2b..45d452df91 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -10,7 +10,7 @@
   * Upgrade descriptor file.
   -->
 
-<install version="3.5.0.0">
+<install version="3.6.0.0">
 	<code function="checkPhpVersion" />
 
 	<upgrade minversion="0.9.9.0" maxversion="3.2.9.9">
@@ -144,6 +144,10 @@
 		<migration class="APP\migration\upgrade\v3_5_0\I10511_RemoveSeriesMenuItems"/>
 	</upgrade>
 
+	<upgrade minversion="3.5.0.0" maxversion="3.5.9.9">
+		<migration class="PKP\migration\upgrade\v3_6_0\PreflightCheckMigration" fallback="3.5.9.9" />
+		<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 55af2f4b33..b2b3d7169e 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 55af2f4b334e684b0e315dbfb135cbdc396c8094
+Subproject commit b2b3d7169ecfbcf760b93f5a41f769718616ce26
diff --git a/lib/ui-library b/lib/ui-library
index 14c7d53439..86888aacc0 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 14c7d534390d774113f11fc2ed9f4f33643dc377
+Subproject commit 86888aacc073c8b2ad9189add69b4c38cfbf422c