Merge branch 'dk/gc-idx-wo-pack' into maint