Merge "Support multiple query packets" into main