Merge branch 'svn_18_3'