Merge "Use a delayed message to schedule the query task" into main