#35 Update V3-8-x branch to current code from svn