Merge branch 'mb/build-contrib-svn-fe'