Major update from SVN repo