diff --git a/config/alfresco/extension/caching-content-store-context.xml.sample b/config/alfresco/extension/caching-content-store-context.xml.sample
index 279f59e24f..d3f34492e6 100644
--- a/config/alfresco/extension/caching-content-store-context.xml.sample
+++ b/config/alfresco/extension/caching-content-store-context.xml.sample
@@ -100,5 +100,8 @@
${system.content.caching.contentCleanup.cronExpression}
+
+ ${system.cronJob.startDelayMinutes}
+
diff --git a/config/alfresco/extension/content-expiration-debug-context.xml.sample b/config/alfresco/extension/content-expiration-debug-context.xml.sample
index 84ceb4c050..99f4c44834 100644
--- a/config/alfresco/extension/content-expiration-debug-context.xml.sample
+++ b/config/alfresco/extension/content-expiration-debug-context.xml.sample
@@ -24,5 +24,8 @@
0 0/2 * * * ?
+
+ ${system.cronJob.startDelayMinutes}
+
diff --git a/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample b/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample
index 357abf646d..d202afb7b5 100644
--- a/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample
+++ b/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample
@@ -49,6 +49,9 @@ that are older than 180 days.
0 0 4 * * ?
+
+ ${system.cronJob.startDelayMinutes}
+
-
\ No newline at end of file
+
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 6af89d5c70..0d628110b4 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -1083,4 +1083,7 @@ system.patch.sharedFolder.cronExpression=0 0 0 ? 1 1 2030
#
# Use a canned query when requested to search for people if " [hint:useCQ]" is provided in search term
#
-people.search.honor.hint.useCQ=true
\ No newline at end of file
+people.search.honor.hint.useCQ=true
+
+# Delays cron jobs after bootstrap to allow server to fully come up before jobs start
+system.cronJob.startDelayMinutes=10
\ No newline at end of file
diff --git a/config/alfresco/scheduled-jobs-context.xml b/config/alfresco/scheduled-jobs-context.xml
index cf273d9532..e7536e611c 100644
--- a/config/alfresco/scheduled-jobs-context.xml
+++ b/config/alfresco/scheduled-jobs-context.xml
@@ -31,6 +31,9 @@
0 30 * * * ?
+
+ ${system.cronJob.startDelayMinutes}
+
@@ -55,6 +58,9 @@
${system.content.orphanCleanup.cronExpression}
+
+ ${system.cronJob.startDelayMinutes}
+
@@ -79,6 +85,9 @@
${system.content.contentUrlConverter.cronExpression}
+
+ ${system.cronJob.startDelayMinutes}
+
@@ -103,6 +112,9 @@
${system.patch.sharedFolder.cronExpression}
+
+ ${system.cronJob.startDelayMinutes}
+
@@ -127,6 +139,9 @@
0 0 21 * * ?
+
+ ${system.cronJob.startDelayMinutes}
+
@@ -147,6 +162,9 @@
+
+ ${system.cronJob.startDelayMinutes}
+
@@ -175,6 +193,9 @@
${version.store.migrateVersionStore.cronExpression}
+
+ ${system.cronJob.startDelayMinutes}
+
@@ -286,6 +307,9 @@
${ticket.cleanup.cronExpression}
+
+ ${system.cronJob.startDelayMinutes}
+
diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
index efd3647ef9..52b07ccd3a 100644
--- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
+++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
@@ -23,6 +23,9 @@
+
+ ${activities.feed.cleaner.startDelayMins}
+
@@ -45,6 +48,9 @@
+
+ ${activities.feed.generator.startDelayMins}
+
@@ -66,6 +72,9 @@
+
+ ${activities.post.lookup.startDelayMins}
+
@@ -88,6 +97,9 @@
+
+ ${activities.post.cleaner.startDelayMins}
+
@@ -113,6 +125,9 @@
+
+ ${activities.feed.notifier.startDelayMins}
+
diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
index b24c6cccc1..c18bd217e0 100644
--- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
+++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
@@ -8,7 +8,7 @@ activities.feed.max.ageMins=44640
# please note:
# - refer to "email/OutboundSMTP" subsystem for SMTP properties (mail.*)
# - refer to "sysAdmin" subsystem for Share url/ctx properties (share.*)
-activities.feed.notifier.startDelayMins=0
+activities.feed.notifier.startDelayMins=${system.cronJob.startDelayMinutes}
# Feed notification period (every 24 hours at 00:00)
activities.feed.notifier.cronExpression=0 0 0 * * ?
activities.feed.notifier.enabled=true
@@ -17,20 +17,24 @@ activities.feed.notifier.emailTemplatePath=/app:company_home/app:dictionary/app:
activities.feed.notifier.emailTemplateLocationType=xpath
# activities feed generator
+activities.feed.generator.startDelayMins=${system.cronJob.startDelayMinutes}
activities.feed.generator.cronExpression=0/30 * * * * ?
activities.feed.generator.maxItemsPerCycle=100
activities.feed.generator.enabled=true
# activities feed cleaner
+activities.feed.cleaner.startDelayMins=${system.cronJob.startDelayMinutes}
# repeat every 10 mins
activities.feed.cleaner.cronExpression=0 0/10 * * * ?
activities.feed.cleaner.enabled=true
# activities post cleaner
+activities.post.cleaner.startDelayMins=${system.cronJob.startDelayMinutes}
activities.post.cleaner.cronExpression=0 0/10 * * * ?
activities.post.cleaner.enabled=true
# activities post lookup
+activities.post.lookup.startDelayMins=${system.cronJob.startDelayMinutes}
activities.post.lookup.cronExpression=0/15 * * * * ?
activities.post.lookup.maxItemsPerCycle=500
activities.post.lookup.enabled=true
\ No newline at end of file
diff --git a/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml b/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
index 9d6875bcb5..cc2046caa2 100644
--- a/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
+++ b/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
@@ -119,6 +119,9 @@