Merge branch 'jn/maint-svn-fe' into next