Merge branch 'jn/gc-auto-prep'