Merge "Move QueryTaskConfig to a standalone class" into main