Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch