Merge branch 'rr/svn-fe' into maint