diff --git a/config.TEMPLATE.inc.php b/config.TEMPLATE.inc.php
index c24deb8754..c8e270154d 100644
--- a/config.TEMPLATE.inc.php
+++ b/config.TEMPLATE.inc.php
@@ -162,8 +162,8 @@
[cache]
; Default driver for Laravel-based caching. Currently supports opcache and file drivers.
-; By default, the opcache is used.
-; default = opcache
+; By default, the file is used.
+; default = file
; Path to store cache contents for file or opcode based caches.
; path = cache/opcache
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 4d3e3e158f..d747f1a82e 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -145,6 +145,7 @@
+
diff --git a/lib/pkp b/lib/pkp
index 71356ea556..922eb775df 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 71356ea556f5a94d134dc0cc3d4f659a0015588f
+Subproject commit 922eb775dfa9a43d7f7fcbdcc3a19e4c557f920e
diff --git a/registry/emailTemplates.xml b/registry/emailTemplates.xml
index 6c8780294b..88fdf952b0 100644
--- a/registry/emailTemplates.xml
+++ b/registry/emailTemplates.xml
@@ -36,4 +36,5 @@
+