8 Commits (disable-dfs_query_then_fetch)