Merge branch 'jn/svn-fe' into next