Merge branch 'rs/fsck-null-return-from-lookup' into maint