Merge branch 'jn/svn-fe' (early part)