Merge branch 'rc/maint-curl-helper' into maint