diff --git a/config.TEMPLATE.inc.php b/config.TEMPLATE.inc.php
index 87b91c85c56..d86405a2229 100644
--- a/config.TEMPLATE.inc.php
+++ b/config.TEMPLATE.inc.php
@@ -568,6 +568,11 @@
 ; memory_limit the server has configured for PHP.
 job_runner_max_memory = 80
 
+; Controls whether queued jobs should be processed by the task scheduler.
+; This setting has no effect when the job_runner and the [schedule].task_runner are enabled,
+; on this situation the jobs will be processed solely by the job runner.
+process_jobs_at_task_scheduler = Off
+
 ; Remove failed jobs from the database after the following number of days.
 ; Remove this setting to leave failed jobs in the database.
 delete_failed_jobs_after = 180
diff --git a/docs/release-notes/README-3.5.0 b/docs/release-notes/README-3.5.0
index b5c2dab8f03..f252460b2ad 100644
--- a/docs/release-notes/README-3.5.0
+++ b/docs/release-notes/README-3.5.0
@@ -24,6 +24,9 @@ New config.inc.php section for schedule task named schedule is added, with the f
 
 - The setting general.scheduled_tasks has been removed. It was supposed to control the schedule tasks but had no impact.
 
+New config.inc.php parameters added for queues:
+    - process_jobs_at_task_scheduler (default value: Off): Controls whether queued jobs should be executed together with the scheduled tasks.
+
 
 New Features
 ------------
diff --git a/lib/pkp b/lib/pkp
index 86d9fe1cdc8..4c85bd38b25 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 86d9fe1cdc851a2518c813092d0c887529e51f59
+Subproject commit 4c85bd38b2581fcd09b6dd9bca0a3852417ad86d