Merge branch 'rs/fsck-obj-leakfix' into maint