Merge branch 'jt/non-blob-lazy-fetch' into maint