Merge branch 'jc/fetch-param' into maint