integrate changes from slarge svn