Merge branch 'jc/maint-fetch-regression-1.5.4'