Ensure datastore_import
queue has time to process
#3727
Merged
datastore_import
queue has time to process
#3727