Merge branch 'jc/maint-fetch-alt' into next