Merge with svn

Sync from 'svn' branch merged *as is*