Merge branch 'nd/fetch-into-shallow' into maint