Merge branch 'dt/disable-bitmap-in-auto-gc' into maint