diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index 5afdd97b9f2..df6b7cb45e4 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"/>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 8dbe55846b0..7da5947bc5e 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -153,9 +153,11 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\COA75_AddUserRoleEndEmail"/>
 	</upgrade>
 
-	<upgrade minversion="3.5.0.0" maxversion="3.5.0.0">
+	<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 4e8a5a1cf52..d2e95866a60 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 4e8a5a1cf523f816286343fe103f7eca52b02e70
+Subproject commit d2e95866a6012ca04c3574aa00360d499820be2c
diff --git a/lib/ui-library b/lib/ui-library
index a67fd26f7fc..34d9dda3cc7 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit a67fd26f7fca5db4b5a0cc3ef3ddc330390ffb64
+Subproject commit 34d9dda3cc74e7d58a92140fd6d0ad5250c95158