Merge remote-tracking branch 'origin/feature/xueyiming/2025-10-09-update-query' into feature/xueyiming/2025-10-09-update-query