Merge branch 'ur/svn-local-zone' into maint