Many changes merged from SVN