SVN sync

latest changes from the dev SVN