Merge branch 'jt/lazy-object-fetch-fix' into maint