Merge branch 'ew/maint-svn-cert-fileprovider'