Merge branch 'nd/complete-fetch-multiple-args'