Merge "Update the QueryTaskConfig constructor" into main