Merge branch 'wg/svn-fe-style-fixes'